diff --git a/src/img/img.pro b/src/img/img.pro index 3c8b62c1b..ca699ed22 100644 --- a/src/img/img.pro +++ b/src/img/img.pro @@ -1,39 +1,6 @@ -DESTDIR = $$OUT_PWD/.. -TARGET = klayout_img +TEMPLATE = subdirs +SUBDIRS = img unit_tests -include($$PWD/../lib.pri) - -DEFINES += MAKE_IMG_LIBRARY - -HEADERS = \ - imgLandmarksDialog.h \ - imgNavigator.h \ - imgObject.h \ - imgPlugin.h \ - imgPropertiesPage.h \ - imgService.h \ - imgWidgets.h \ - imgForceLink.h \ - imgCommon.h - -FORMS = \ - AddNewImageDialog.ui \ - ImageLandmarksDialog.ui \ - ImagePropertiesPage.ui \ - -SOURCES = \ - gsiDeclImg.cc \ - imgLandmarksDialog.cc \ - imgNavigator.cc \ - imgObject.cc \ - imgPlugin.cc \ - imgPropertiesPage.cc \ - imgService.cc \ - imgWidgets.cc \ - imgForceLink.cc - -INCLUDEPATH += $$TL_INC $$GSI_INC $$LAYBASIC_INC $$DB_INC -DEPENDPATH += $$TL_INC $$GSI_INC $$LAYBASIC_INC $$DB_INC -LIBS += -L$$DESTDIR -lklayout_tl -lklayout_gsi -lklayout_laybasic -lklayout_db +unit_tests.depends += img diff --git a/src/img/AddNewImageDialog.ui b/src/img/img/AddNewImageDialog.ui similarity index 100% rename from src/img/AddNewImageDialog.ui rename to src/img/img/AddNewImageDialog.ui diff --git a/src/img/ImageLandmarksDialog.ui b/src/img/img/ImageLandmarksDialog.ui similarity index 100% rename from src/img/ImageLandmarksDialog.ui rename to src/img/img/ImageLandmarksDialog.ui diff --git a/src/img/ImagePropertiesPage.ui b/src/img/img/ImagePropertiesPage.ui similarity index 100% rename from src/img/ImagePropertiesPage.ui rename to src/img/img/ImagePropertiesPage.ui diff --git a/src/img/gsiDeclImg.cc b/src/img/img/gsiDeclImg.cc similarity index 100% rename from src/img/gsiDeclImg.cc rename to src/img/img/gsiDeclImg.cc diff --git a/src/img/img/img.pro b/src/img/img/img.pro new file mode 100644 index 000000000..2f667acbb --- /dev/null +++ b/src/img/img/img.pro @@ -0,0 +1,39 @@ + +DESTDIR = $$OUT_PWD/../.. +TARGET = klayout_img + +include($$PWD/../../lib.pri) + +DEFINES += MAKE_IMG_LIBRARY + +HEADERS = \ + imgLandmarksDialog.h \ + imgNavigator.h \ + imgObject.h \ + imgPlugin.h \ + imgPropertiesPage.h \ + imgService.h \ + imgWidgets.h \ + imgForceLink.h \ + imgCommon.h + +FORMS = \ + AddNewImageDialog.ui \ + ImageLandmarksDialog.ui \ + ImagePropertiesPage.ui \ + +SOURCES = \ + gsiDeclImg.cc \ + imgLandmarksDialog.cc \ + imgNavigator.cc \ + imgObject.cc \ + imgPlugin.cc \ + imgPropertiesPage.cc \ + imgService.cc \ + imgWidgets.cc \ + imgForceLink.cc + +INCLUDEPATH += $$TL_INC $$DB_INC $$GSI_INC $$LAYBASIC_INC $$DB_INC +DEPENDPATH += $$TL_INC $$DB_INC $$GSI_INC $$LAYBASIC_INC $$DB_INC +LIBS += -L$$DESTDIR -lklayout_tl -lklayout_db -lklayout_gsi -lklayout_laybasic -lklayout_db + diff --git a/src/img/imgCommon.h b/src/img/img/imgCommon.h similarity index 100% rename from src/img/imgCommon.h rename to src/img/img/imgCommon.h diff --git a/src/img/imgForceLink.cc b/src/img/img/imgForceLink.cc similarity index 100% rename from src/img/imgForceLink.cc rename to src/img/img/imgForceLink.cc diff --git a/src/img/imgForceLink.h b/src/img/img/imgForceLink.h similarity index 100% rename from src/img/imgForceLink.h rename to src/img/img/imgForceLink.h diff --git a/src/img/imgLandmarksDialog.cc b/src/img/img/imgLandmarksDialog.cc similarity index 100% rename from src/img/imgLandmarksDialog.cc rename to src/img/img/imgLandmarksDialog.cc diff --git a/src/img/imgLandmarksDialog.h b/src/img/img/imgLandmarksDialog.h similarity index 100% rename from src/img/imgLandmarksDialog.h rename to src/img/img/imgLandmarksDialog.h diff --git a/src/img/imgNavigator.cc b/src/img/img/imgNavigator.cc similarity index 100% rename from src/img/imgNavigator.cc rename to src/img/img/imgNavigator.cc diff --git a/src/img/imgNavigator.h b/src/img/img/imgNavigator.h similarity index 100% rename from src/img/imgNavigator.h rename to src/img/img/imgNavigator.h diff --git a/src/img/imgObject.cc b/src/img/img/imgObject.cc similarity index 100% rename from src/img/imgObject.cc rename to src/img/img/imgObject.cc diff --git a/src/img/imgObject.h b/src/img/img/imgObject.h similarity index 100% rename from src/img/imgObject.h rename to src/img/img/imgObject.h diff --git a/src/img/imgPlugin.cc b/src/img/img/imgPlugin.cc similarity index 100% rename from src/img/imgPlugin.cc rename to src/img/img/imgPlugin.cc diff --git a/src/img/imgPlugin.h b/src/img/img/imgPlugin.h similarity index 100% rename from src/img/imgPlugin.h rename to src/img/img/imgPlugin.h diff --git a/src/img/imgPropertiesPage.cc b/src/img/img/imgPropertiesPage.cc similarity index 100% rename from src/img/imgPropertiesPage.cc rename to src/img/img/imgPropertiesPage.cc diff --git a/src/img/imgPropertiesPage.h b/src/img/img/imgPropertiesPage.h similarity index 100% rename from src/img/imgPropertiesPage.h rename to src/img/img/imgPropertiesPage.h diff --git a/src/img/imgService.cc b/src/img/img/imgService.cc similarity index 100% rename from src/img/imgService.cc rename to src/img/img/imgService.cc diff --git a/src/img/imgService.h b/src/img/img/imgService.h similarity index 100% rename from src/img/imgService.h rename to src/img/img/imgService.h diff --git a/src/img/imgWidgets.cc b/src/img/img/imgWidgets.cc similarity index 100% rename from src/img/imgWidgets.cc rename to src/img/img/imgWidgets.cc diff --git a/src/img/imgWidgets.h b/src/img/img/imgWidgets.h similarity index 100% rename from src/img/imgWidgets.h rename to src/img/img/imgWidgets.h diff --git a/src/unit_tests/imgObject.cc b/src/img/unit_tests/imgObject.cc similarity index 100% rename from src/unit_tests/imgObject.cc rename to src/img/unit_tests/imgObject.cc diff --git a/src/img/unit_tests/unit_tests.pro b/src/img/unit_tests/unit_tests.pro new file mode 100644 index 000000000..bbdef297c --- /dev/null +++ b/src/img/unit_tests/unit_tests.pro @@ -0,0 +1,16 @@ + +DESTDIR_UT = $$OUT_PWD/../.. +DESTDIR = $$OUT_PWD/.. + +TARGET = img_tests + +include($$PWD/../../lib_ut.pri) + +SOURCES = \ + imgObject.cc \ + +INCLUDEPATH += $$IMG_INC $$DB_INC $$TL_INC $$LAYBASIC_INC $$GSI_INC $$UT_INC +DEPENDPATH += $$IMG_INC $$DB_INC $$TL_INC $$LAYBASIC_INC $$GSI_INC $$UT_INC + +LIBS += -L$$DESTDIR_UT -lklayout_img -lklayout_laybasic -lklayout_db -lklayout_tl -lklayout_gsi -lklayout_ut + diff --git a/src/klayout.pri b/src/klayout.pri index f317fe691..d5f42ed17 100644 --- a/src/klayout.pri +++ b/src/klayout.pri @@ -6,12 +6,12 @@ EDT_INC = $$PWD/edt/edt EXT_INC = $$PWD/ext/ext GSI_INC = $$PWD/gsi/gsi ANT_INC = $$PWD/ant/ant -IMG_INC = $$PWD/img -LIB_INC = $$PWD/lib -LAY_INC = $$PWD/lay -LAYBASIC_INC = $$PWD/laybasic -LYM_INC = $$PWD/lym -RDB_INC = $$PWD/rdb +RDB_INC = $$PWD/rdb/rdb +IMG_INC = $$PWD/img/img +LYM_INC = $$PWD/lym/lym +LIB_INC = $$PWD/lib/lib +LAY_INC = $$PWD/lay/lay +LAYBASIC_INC = $$PWD/laybasic/laybasic GSIQT_INC = $$PWD/gsiqt diff --git a/src/klayout.pro b/src/klayout.pro index 21f15c9a6..0c9adfa54 100644 --- a/src/klayout.pro +++ b/src/klayout.pro @@ -73,12 +73,12 @@ equals(HAVE_QTBINDINGS, "1") { } ext.depends += lay -ut.depends += lay ext lib +ut.depends += tl db gsi plugins.depends += lay ext lib ut klayout_main.depends += lay ext lib plugins -unit_tests.depends += ut plugins +unit_tests.depends += ut lay ext lib RESOURCES += \ laybasic/layResources.qrc \ diff --git a/src/lay/lay.pro b/src/lay/lay.pro index fe3b345ea..96502b3a4 100644 --- a/src/lay/lay.pro +++ b/src/lay/lay.pro @@ -1,211 +1,6 @@ -DESTDIR = $$OUT_PWD/.. -TARGET = klayout_lay +TEMPLATE = subdirs +SUBDIRS = lay unit_tests -include($$PWD/../lib.pri) - -DEFINES += MAKE_LAY_LIBRARY - -HEADERS = \ - layApplication.h \ - layClipDialog.h \ - layCrashMessage.h \ - layFillDialog.h \ - layGenericSyntaxHighlighter.h \ - layGSIHelpProvider.h \ - layHelpDialog.h \ - layHelpProvider.h \ - layHelpSource.h \ - layLayoutStatisticsForm.h \ - layLogViewerDialog.h \ - layMacroEditorDialog.h \ - layMacroEditorPage.h \ - layMacroEditorSetupDialog.h \ - layMacroEditorTree.h \ - layMacroPropertiesDialog.h \ - layMacroVariableView.h \ - layMainConfigPages.h \ - layMainWindow.h \ - layNavigator.h \ - layProgress.h \ - layProgressWidget.h \ - layResourceHelpProvider.h \ - layRuntimeErrorForm.h \ - laySearchReplaceConfigPage.h \ - laySearchReplaceDialog.h \ - laySearchReplacePropertiesWidgets.h \ - laySelectCellViewForm.h \ - laySession.h \ - laySettingsForm.h \ - layTechSetupDialog.h \ - layTextProgress.h \ - layVersion.h \ - layCommon.h \ - layConfig.h \ - layMacroController.h \ - layTechnologyController.h \ - laySalt.h \ - laySaltGrain.h \ - laySaltGrains.h \ - laySaltManagerDialog.h \ - laySaltGrainDetailsTextWidget.h \ - laySaltGrainPropertiesDialog.h \ - laySaltDownloadManager.h \ - laySaltModel.h \ - laySaltController.h \ - laySignalHandler.h \ - layLibraryController.h \ - layFontController.h \ - layNativePlugin.h - -FORMS = \ - ClipDialog.ui \ - CrashMessage.ui \ - Console.ui \ - DeleteModeDialog.ui \ - FillDialog.ui \ - HelpAboutDialog.ui \ - KeyBindingsConfigPage.ui \ - LayoutStatistics.ui \ - LogViewerDialog.ui \ - MacroEditorDialog.ui \ - MacroEditorSetupDialog.ui \ - MacroPropertiesDialog.ui \ - MacroTemplateSelectionDialog.ui \ - MainConfigPage.ui \ - MainConfigPage2.ui \ - MainConfigPage3.ui \ - MainConfigPage4.ui \ - MainConfigPage5.ui \ - MainConfigPage6.ui \ - ReplacePropertiesBox.ui \ - ReplacePropertiesInstance.ui \ - ReplacePropertiesPath.ui \ - ReplacePropertiesShape.ui \ - ReplacePropertiesText.ui \ - RuntimeErrorForm.ui \ - SearchPropertiesBox.ui \ - SearchPropertiesInstance.ui \ - SearchPropertiesPath.ui \ - SearchPropertiesShape.ui \ - SearchPropertiesText.ui \ - SearchReplaceConfigPage.ui \ - SearchReplaceDialog.ui \ - SelectCellViewForm.ui \ - SettingsForm.ui \ - TechBaseEditorPage.ui \ - TechComponentSetupDialog.ui \ - TechLayerMappingEditorPage.ui \ - TechMacrosPage.ui \ - TechSetupDialog.ui \ - XORToolDialog.ui \ - TechLoadOptionsEditorPage.ui \ - TechSaveOptionsEditorPage.ui \ - MainConfigPage7.ui \ - SaltManagerDialog.ui \ - SaltGrainPropertiesDialog.ui \ - SaltGrainTemplateSelectionDialog.ui \ - SaltManagerInstallConfirmationDialog.ui - -SOURCES = \ - gsiDeclLayApplication.cc \ - gsiDeclLayHelpDialog.cc \ - gsiDeclLayMainWindow.cc \ - layApplication.cc \ - layClipDialog.cc \ - layCrashMessage.cc \ - layFillDialog.cc \ - layGenericSyntaxHighlighter.cc \ - layGSIHelpProvider.cc \ - layHelpDialog.cc \ - layHelpProvider.cc \ - layHelpSource.cc \ - layLayoutStatisticsForm.cc \ - layLogViewerDialog.cc \ - layMacroEditorDialog.cc \ - layMacroEditorPage.cc \ - layMacroEditorSetupDialog.cc \ - layMacroEditorTree.cc \ - layMacroPropertiesDialog.cc \ - layMacroVariableView.cc \ - layMainConfigPages.cc \ - layMainWindow.cc \ - layNavigator.cc \ - layProgress.cc \ - layProgressWidget.cc \ - layResourceHelpProvider.cc \ - layRuntimeErrorForm.cc \ - laySearchReplaceConfigPage.cc \ - laySearchReplaceDialog.cc \ - laySearchReplacePlugin.cc \ - laySearchReplacePropertiesWidgets.cc \ - laySelectCellViewForm.cc \ - laySession.cc \ - laySettingsForm.cc \ - layTechSetupDialog.cc \ - layTextProgress.cc \ - layVersion.cc \ - layMacroController.cc \ - layTechnologyController.cc \ - laySalt.cc \ - laySaltGrain.cc \ - laySaltGrains.cc \ - laySaltManagerDialog.cc \ - laySaltGrainDetailsTextWidget.cc \ - laySaltGrainPropertiesDialog.cc \ - laySaltDownloadManager.cc \ - laySaltModel.cc \ - laySaltController.cc \ - laySignalHandler.cc \ - layLibraryController.cc \ - layFontController.cc \ - layNativePlugin.cc - -RESOURCES = layBuildInMacros.qrc \ - layHelpResources.qrc \ - layLayoutStatistics.qrc \ - layMacroTemplates.qrc \ - layResources.qrc \ - laySaltTemplates.qrc - -INCLUDEPATH += $$TL_INC $$GSI_INC $$DB_INC $$RDB_INC $$LAYBASIC_INC $$ANT_INC $$IMG_INC $$EDT_INC $$LYM_INC -DEPENDPATH += $$TL_INC $$GSI_INC $$DB_INC $$RDB_INC $$LAYBASIC_INC $$ANT_INC $$IMG_INC $$EDT_INC $$LYM_INC -LIBS += -L$$DESTDIR -lklayout_tl -lklayout_gsi -lklayout_db -lklayout_rdb -lklayout_lym -lklayout_laybasic -lklayout_ant -lklayout_img -lklayout_edt - -win32 { - # for stack trace support: - # lpsapi for GetModuleFileName and others - # dbghelp for SymFromAddr and other - LIBS += -lpsapi -ldbghelp -} - -# Note: this accounts for UI-generated headers placed into the output folders in -# shadow builds: -INCLUDEPATH += $$DESTDIR/laybasic -DEPENDPATH += $$DESTDIR/laybasic - -INCLUDEPATH += $$GSIQT_INC -DEPENDPATH += $$GSIQT_INC - -equals(HAVE_QTBINDINGS, "1") { - LIBS += -lklayout_gsiqt -} - -INCLUDEPATH += $$RBA_INC -DEPENDPATH += $$RBA_INC - -equals(HAVE_RUBY, "1") { - LIBS += -lklayout_rba -} else { - LIBS += -lklayout_rbastub -} - -INCLUDEPATH += $$PYA_INC -DEPENDPATH += $$PYA_INC - -equals(HAVE_PYTHON, "1") { - LIBS += -lklayout_pya -} else { - LIBS += -lklayout_pyastub -} +unit_tests.depends += lay diff --git a/src/lay/ClipDialog.ui b/src/lay/lay/ClipDialog.ui similarity index 100% rename from src/lay/ClipDialog.ui rename to src/lay/lay/ClipDialog.ui diff --git a/src/lay/Console.ui b/src/lay/lay/Console.ui similarity index 100% rename from src/lay/Console.ui rename to src/lay/lay/Console.ui diff --git a/src/lay/CrashMessage.ui b/src/lay/lay/CrashMessage.ui similarity index 100% rename from src/lay/CrashMessage.ui rename to src/lay/lay/CrashMessage.ui diff --git a/src/lay/DeleteModeDialog.ui b/src/lay/lay/DeleteModeDialog.ui similarity index 100% rename from src/lay/DeleteModeDialog.ui rename to src/lay/lay/DeleteModeDialog.ui diff --git a/src/lay/FillDialog.ui b/src/lay/lay/FillDialog.ui similarity index 100% rename from src/lay/FillDialog.ui rename to src/lay/lay/FillDialog.ui diff --git a/src/lay/HelpAboutDialog.ui b/src/lay/lay/HelpAboutDialog.ui similarity index 100% rename from src/lay/HelpAboutDialog.ui rename to src/lay/lay/HelpAboutDialog.ui diff --git a/src/lay/KeyBindingsConfigPage.ui b/src/lay/lay/KeyBindingsConfigPage.ui similarity index 100% rename from src/lay/KeyBindingsConfigPage.ui rename to src/lay/lay/KeyBindingsConfigPage.ui diff --git a/src/lay/LayoutStatistics.ui b/src/lay/lay/LayoutStatistics.ui similarity index 100% rename from src/lay/LayoutStatistics.ui rename to src/lay/lay/LayoutStatistics.ui diff --git a/src/lay/LogViewerDialog.ui b/src/lay/lay/LogViewerDialog.ui similarity index 100% rename from src/lay/LogViewerDialog.ui rename to src/lay/lay/LogViewerDialog.ui diff --git a/src/lay/MacroEditorDialog.ui b/src/lay/lay/MacroEditorDialog.ui similarity index 100% rename from src/lay/MacroEditorDialog.ui rename to src/lay/lay/MacroEditorDialog.ui diff --git a/src/lay/MacroEditorSetupDialog.ui b/src/lay/lay/MacroEditorSetupDialog.ui similarity index 100% rename from src/lay/MacroEditorSetupDialog.ui rename to src/lay/lay/MacroEditorSetupDialog.ui diff --git a/src/lay/MacroPropertiesDialog.ui b/src/lay/lay/MacroPropertiesDialog.ui similarity index 100% rename from src/lay/MacroPropertiesDialog.ui rename to src/lay/lay/MacroPropertiesDialog.ui diff --git a/src/lay/MacroTemplateSelectionDialog.ui b/src/lay/lay/MacroTemplateSelectionDialog.ui similarity index 100% rename from src/lay/MacroTemplateSelectionDialog.ui rename to src/lay/lay/MacroTemplateSelectionDialog.ui diff --git a/src/lay/MainConfigPage.ui b/src/lay/lay/MainConfigPage.ui similarity index 100% rename from src/lay/MainConfigPage.ui rename to src/lay/lay/MainConfigPage.ui diff --git a/src/lay/MainConfigPage2.ui b/src/lay/lay/MainConfigPage2.ui similarity index 100% rename from src/lay/MainConfigPage2.ui rename to src/lay/lay/MainConfigPage2.ui diff --git a/src/lay/MainConfigPage3.ui b/src/lay/lay/MainConfigPage3.ui similarity index 100% rename from src/lay/MainConfigPage3.ui rename to src/lay/lay/MainConfigPage3.ui diff --git a/src/lay/MainConfigPage4.ui b/src/lay/lay/MainConfigPage4.ui similarity index 100% rename from src/lay/MainConfigPage4.ui rename to src/lay/lay/MainConfigPage4.ui diff --git a/src/lay/MainConfigPage5.ui b/src/lay/lay/MainConfigPage5.ui similarity index 100% rename from src/lay/MainConfigPage5.ui rename to src/lay/lay/MainConfigPage5.ui diff --git a/src/lay/MainConfigPage6.ui b/src/lay/lay/MainConfigPage6.ui similarity index 100% rename from src/lay/MainConfigPage6.ui rename to src/lay/lay/MainConfigPage6.ui diff --git a/src/lay/MainConfigPage7.ui b/src/lay/lay/MainConfigPage7.ui similarity index 100% rename from src/lay/MainConfigPage7.ui rename to src/lay/lay/MainConfigPage7.ui diff --git a/src/lay/MergeOptionsDialog.ui b/src/lay/lay/MergeOptionsDialog.ui similarity index 100% rename from src/lay/MergeOptionsDialog.ui rename to src/lay/lay/MergeOptionsDialog.ui diff --git a/src/lay/ReplacePropertiesBox.ui b/src/lay/lay/ReplacePropertiesBox.ui similarity index 100% rename from src/lay/ReplacePropertiesBox.ui rename to src/lay/lay/ReplacePropertiesBox.ui diff --git a/src/lay/ReplacePropertiesInstance.ui b/src/lay/lay/ReplacePropertiesInstance.ui similarity index 100% rename from src/lay/ReplacePropertiesInstance.ui rename to src/lay/lay/ReplacePropertiesInstance.ui diff --git a/src/lay/ReplacePropertiesPath.ui b/src/lay/lay/ReplacePropertiesPath.ui similarity index 100% rename from src/lay/ReplacePropertiesPath.ui rename to src/lay/lay/ReplacePropertiesPath.ui diff --git a/src/lay/ReplacePropertiesShape.ui b/src/lay/lay/ReplacePropertiesShape.ui similarity index 100% rename from src/lay/ReplacePropertiesShape.ui rename to src/lay/lay/ReplacePropertiesShape.ui diff --git a/src/lay/ReplacePropertiesText.ui b/src/lay/lay/ReplacePropertiesText.ui similarity index 100% rename from src/lay/ReplacePropertiesText.ui rename to src/lay/lay/ReplacePropertiesText.ui diff --git a/src/lay/RuntimeErrorForm.ui b/src/lay/lay/RuntimeErrorForm.ui similarity index 100% rename from src/lay/RuntimeErrorForm.ui rename to src/lay/lay/RuntimeErrorForm.ui diff --git a/src/lay/SaltGrainPropertiesDialog.ui b/src/lay/lay/SaltGrainPropertiesDialog.ui similarity index 100% rename from src/lay/SaltGrainPropertiesDialog.ui rename to src/lay/lay/SaltGrainPropertiesDialog.ui diff --git a/src/lay/SaltGrainTemplateSelectionDialog.ui b/src/lay/lay/SaltGrainTemplateSelectionDialog.ui similarity index 100% rename from src/lay/SaltGrainTemplateSelectionDialog.ui rename to src/lay/lay/SaltGrainTemplateSelectionDialog.ui diff --git a/src/lay/SaltManagerDialog.ui b/src/lay/lay/SaltManagerDialog.ui similarity index 100% rename from src/lay/SaltManagerDialog.ui rename to src/lay/lay/SaltManagerDialog.ui diff --git a/src/lay/SaltManagerInstallConfirmationDialog.ui b/src/lay/lay/SaltManagerInstallConfirmationDialog.ui similarity index 100% rename from src/lay/SaltManagerInstallConfirmationDialog.ui rename to src/lay/lay/SaltManagerInstallConfirmationDialog.ui diff --git a/src/lay/SearchPropertiesBox.ui b/src/lay/lay/SearchPropertiesBox.ui similarity index 100% rename from src/lay/SearchPropertiesBox.ui rename to src/lay/lay/SearchPropertiesBox.ui diff --git a/src/lay/SearchPropertiesInstance.ui b/src/lay/lay/SearchPropertiesInstance.ui similarity index 100% rename from src/lay/SearchPropertiesInstance.ui rename to src/lay/lay/SearchPropertiesInstance.ui diff --git a/src/lay/SearchPropertiesPath.ui b/src/lay/lay/SearchPropertiesPath.ui similarity index 100% rename from src/lay/SearchPropertiesPath.ui rename to src/lay/lay/SearchPropertiesPath.ui diff --git a/src/lay/SearchPropertiesShape.ui b/src/lay/lay/SearchPropertiesShape.ui similarity index 100% rename from src/lay/SearchPropertiesShape.ui rename to src/lay/lay/SearchPropertiesShape.ui diff --git a/src/lay/SearchPropertiesText.ui b/src/lay/lay/SearchPropertiesText.ui similarity index 100% rename from src/lay/SearchPropertiesText.ui rename to src/lay/lay/SearchPropertiesText.ui diff --git a/src/lay/SearchReplaceConfigPage.ui b/src/lay/lay/SearchReplaceConfigPage.ui similarity index 100% rename from src/lay/SearchReplaceConfigPage.ui rename to src/lay/lay/SearchReplaceConfigPage.ui diff --git a/src/lay/SearchReplaceDialog.ui b/src/lay/lay/SearchReplaceDialog.ui similarity index 100% rename from src/lay/SearchReplaceDialog.ui rename to src/lay/lay/SearchReplaceDialog.ui diff --git a/src/lay/SelectCellViewForm.ui b/src/lay/lay/SelectCellViewForm.ui similarity index 100% rename from src/lay/SelectCellViewForm.ui rename to src/lay/lay/SelectCellViewForm.ui diff --git a/src/lay/SettingsForm.ui b/src/lay/lay/SettingsForm.ui similarity index 100% rename from src/lay/SettingsForm.ui rename to src/lay/lay/SettingsForm.ui diff --git a/src/lay/TechBaseEditorPage.ui b/src/lay/lay/TechBaseEditorPage.ui similarity index 100% rename from src/lay/TechBaseEditorPage.ui rename to src/lay/lay/TechBaseEditorPage.ui diff --git a/src/lay/TechComponentSetupDialog.ui b/src/lay/lay/TechComponentSetupDialog.ui similarity index 100% rename from src/lay/TechComponentSetupDialog.ui rename to src/lay/lay/TechComponentSetupDialog.ui diff --git a/src/lay/TechLayerMappingEditorPage.ui b/src/lay/lay/TechLayerMappingEditorPage.ui similarity index 100% rename from src/lay/TechLayerMappingEditorPage.ui rename to src/lay/lay/TechLayerMappingEditorPage.ui diff --git a/src/lay/TechLoadOptionsEditorPage.ui b/src/lay/lay/TechLoadOptionsEditorPage.ui similarity index 100% rename from src/lay/TechLoadOptionsEditorPage.ui rename to src/lay/lay/TechLoadOptionsEditorPage.ui diff --git a/src/lay/TechMacrosPage.ui b/src/lay/lay/TechMacrosPage.ui similarity index 100% rename from src/lay/TechMacrosPage.ui rename to src/lay/lay/TechMacrosPage.ui diff --git a/src/lay/TechSaveOptionsEditorPage.ui b/src/lay/lay/TechSaveOptionsEditorPage.ui similarity index 100% rename from src/lay/TechSaveOptionsEditorPage.ui rename to src/lay/lay/TechSaveOptionsEditorPage.ui diff --git a/src/lay/TechSetupDialog.ui b/src/lay/lay/TechSetupDialog.ui similarity index 100% rename from src/lay/TechSetupDialog.ui rename to src/lay/lay/TechSetupDialog.ui diff --git a/src/lay/XORToolDialog.ui b/src/lay/lay/XORToolDialog.ui similarity index 100% rename from src/lay/XORToolDialog.ui rename to src/lay/lay/XORToolDialog.ui diff --git a/src/lay/built_in_macros/qobject_helper.lym b/src/lay/lay/built_in_macros/qobject_helper.lym similarity index 100% rename from src/lay/built_in_macros/qobject_helper.lym rename to src/lay/lay/built_in_macros/qobject_helper.lym diff --git a/src/lay/built_in_pymacros/qt_helper.lym b/src/lay/lay/built_in_pymacros/qt_helper.lym similarity index 100% rename from src/lay/built_in_pymacros/qt_helper.lym rename to src/lay/lay/built_in_pymacros/qt_helper.lym diff --git a/src/lay/doc/about/about_libraries.xml b/src/lay/lay/doc/about/about_libraries.xml similarity index 100% rename from src/lay/doc/about/about_libraries.xml rename to src/lay/lay/doc/about/about_libraries.xml diff --git a/src/lay/doc/about/about_pcells.xml b/src/lay/lay/doc/about/about_pcells.xml similarity index 100% rename from src/lay/doc/about/about_pcells.xml rename to src/lay/lay/doc/about/about_pcells.xml diff --git a/src/lay/doc/about/basic_lib.xml b/src/lay/lay/doc/about/basic_lib.xml similarity index 100% rename from src/lay/doc/about/basic_lib.xml rename to src/lay/lay/doc/about/basic_lib.xml diff --git a/src/lay/doc/about/basic_text.png b/src/lay/lay/doc/about/basic_text.png similarity index 100% rename from src/lay/doc/about/basic_text.png rename to src/lay/lay/doc/about/basic_text.png diff --git a/src/lay/doc/about/connectivity.xml b/src/lay/lay/doc/about/connectivity.xml similarity index 100% rename from src/lay/doc/about/connectivity.xml rename to src/lay/lay/doc/about/connectivity.xml diff --git a/src/lay/doc/about/custom_queries.xml b/src/lay/lay/doc/about/custom_queries.xml similarity index 100% rename from src/lay/doc/about/custom_queries.xml rename to src/lay/lay/doc/about/custom_queries.xml diff --git a/src/lay/doc/about/def_import_snapshot.png b/src/lay/lay/doc/about/def_import_snapshot.png similarity index 100% rename from src/lay/doc/about/def_import_snapshot.png rename to src/lay/lay/doc/about/def_import_snapshot.png diff --git a/src/lay/doc/about/drc_ref.xml b/src/lay/lay/doc/about/drc_ref.xml similarity index 100% rename from src/lay/doc/about/drc_ref.xml rename to src/lay/lay/doc/about/drc_ref.xml diff --git a/src/lay/doc/about/drc_ref_global.xml b/src/lay/lay/doc/about/drc_ref_global.xml similarity index 100% rename from src/lay/doc/about/drc_ref_global.xml rename to src/lay/lay/doc/about/drc_ref_global.xml diff --git a/src/lay/doc/about/drc_ref_layer.xml b/src/lay/lay/doc/about/drc_ref_layer.xml similarity index 100% rename from src/lay/doc/about/drc_ref_layer.xml rename to src/lay/lay/doc/about/drc_ref_layer.xml diff --git a/src/lay/doc/about/drc_ref_source.xml b/src/lay/lay/doc/about/drc_ref_source.xml similarity index 100% rename from src/lay/doc/about/drc_ref_source.xml rename to src/lay/lay/doc/about/drc_ref_source.xml diff --git a/src/lay/doc/about/expressions.xml b/src/lay/lay/doc/about/expressions.xml similarity index 100% rename from src/lay/doc/about/expressions.xml rename to src/lay/lay/doc/about/expressions.xml diff --git a/src/lay/doc/about/ide_browser_toolbar.png b/src/lay/lay/doc/about/ide_browser_toolbar.png similarity index 100% rename from src/lay/doc/about/ide_browser_toolbar.png rename to src/lay/lay/doc/about/ide_browser_toolbar.png diff --git a/src/lay/doc/about/ide_console.png b/src/lay/lay/doc/about/ide_console.png similarity index 100% rename from src/lay/doc/about/ide_console.png rename to src/lay/lay/doc/about/ide_console.png diff --git a/src/lay/doc/about/ide_debugging_snapshot.png b/src/lay/lay/doc/about/ide_debugging_snapshot.png similarity index 100% rename from src/lay/doc/about/ide_debugging_snapshot.png rename to src/lay/lay/doc/about/ide_debugging_snapshot.png diff --git a/src/lay/doc/about/ide_editor_toolbar.png b/src/lay/lay/doc/about/ide_editor_toolbar.png similarity index 100% rename from src/lay/doc/about/ide_editor_toolbar.png rename to src/lay/lay/doc/about/ide_editor_toolbar.png diff --git a/src/lay/doc/about/ide_py_debugging_snapshot.png b/src/lay/lay/doc/about/ide_py_debugging_snapshot.png similarity index 100% rename from src/lay/doc/about/ide_py_debugging_snapshot.png rename to src/lay/lay/doc/about/ide_py_debugging_snapshot.png diff --git a/src/lay/doc/about/ide_snapshot.png b/src/lay/lay/doc/about/ide_snapshot.png similarity index 100% rename from src/lay/doc/about/ide_snapshot.png rename to src/lay/lay/doc/about/ide_snapshot.png diff --git a/src/lay/doc/about/index.xml b/src/lay/lay/doc/about/index.xml similarity index 100% rename from src/lay/doc/about/index.xml rename to src/lay/lay/doc/about/index.xml diff --git a/src/lay/doc/about/layer_mapping.xml b/src/lay/lay/doc/about/layer_mapping.xml similarity index 100% rename from src/lay/doc/about/layer_mapping.xml rename to src/lay/lay/doc/about/layer_mapping.xml diff --git a/src/lay/doc/about/layer_sources.xml b/src/lay/lay/doc/about/layer_sources.xml similarity index 100% rename from src/lay/doc/about/layer_sources.xml rename to src/lay/lay/doc/about/layer_sources.xml diff --git a/src/lay/doc/about/lef_def_import.xml b/src/lay/lay/doc/about/lef_def_import.xml similarity index 100% rename from src/lay/doc/about/lef_def_import.xml rename to src/lay/lay/doc/about/lef_def_import.xml diff --git a/src/lay/doc/about/lef_import_snapshot.png b/src/lay/lay/doc/about/lef_import_snapshot.png similarity index 100% rename from src/lay/doc/about/lef_import_snapshot.png rename to src/lay/lay/doc/about/lef_import_snapshot.png diff --git a/src/lay/doc/about/lefdef_options_snapshot.png b/src/lay/lay/doc/about/lefdef_options_snapshot.png similarity index 100% rename from src/lay/doc/about/lefdef_options_snapshot.png rename to src/lay/lay/doc/about/lefdef_options_snapshot.png diff --git a/src/lay/doc/about/macro_editor.xml b/src/lay/lay/doc/about/macro_editor.xml similarity index 100% rename from src/lay/doc/about/macro_editor.xml rename to src/lay/lay/doc/about/macro_editor.xml diff --git a/src/lay/doc/about/macro_in_menu.xml b/src/lay/lay/doc/about/macro_in_menu.xml similarity index 100% rename from src/lay/doc/about/macro_in_menu.xml rename to src/lay/lay/doc/about/macro_in_menu.xml diff --git a/src/lay/doc/about/packages.xml b/src/lay/lay/doc/about/packages.xml similarity index 100% rename from src/lay/doc/about/packages.xml rename to src/lay/lay/doc/about/packages.xml diff --git a/src/lay/doc/about/pie_arc.png b/src/lay/lay/doc/about/pie_arc.png similarity index 100% rename from src/lay/doc/about/pie_arc.png rename to src/lay/lay/doc/about/pie_arc.png diff --git a/src/lay/doc/about/rba_notation.xml b/src/lay/lay/doc/about/rba_notation.xml similarity index 100% rename from src/lay/doc/about/rba_notation.xml rename to src/lay/lay/doc/about/rba_notation.xml diff --git a/src/lay/doc/about/round_path.png b/src/lay/lay/doc/about/round_path.png similarity index 100% rename from src/lay/doc/about/round_path.png rename to src/lay/lay/doc/about/round_path.png diff --git a/src/lay/doc/about/round_polygon.png b/src/lay/lay/doc/about/round_polygon.png similarity index 100% rename from src/lay/doc/about/round_polygon.png rename to src/lay/lay/doc/about/round_polygon.png diff --git a/src/lay/doc/about/stroked_polygon.png b/src/lay/lay/doc/about/stroked_polygon.png similarity index 100% rename from src/lay/doc/about/stroked_polygon.png rename to src/lay/lay/doc/about/stroked_polygon.png diff --git a/src/lay/doc/about/symbolic_layers.xml b/src/lay/lay/doc/about/symbolic_layers.xml similarity index 100% rename from src/lay/doc/about/symbolic_layers.xml rename to src/lay/lay/doc/about/symbolic_layers.xml diff --git a/src/lay/doc/about/technology_manager.xml b/src/lay/lay/doc/about/technology_manager.xml similarity index 100% rename from src/lay/doc/about/technology_manager.xml rename to src/lay/lay/doc/about/technology_manager.xml diff --git a/src/lay/doc/about/transformation_basic.png b/src/lay/lay/doc/about/transformation_basic.png similarity index 100% rename from src/lay/doc/about/transformation_basic.png rename to src/lay/lay/doc/about/transformation_basic.png diff --git a/src/lay/doc/about/transformation_overview.png b/src/lay/lay/doc/about/transformation_overview.png similarity index 100% rename from src/lay/doc/about/transformation_overview.png rename to src/lay/lay/doc/about/transformation_overview.png diff --git a/src/lay/doc/about/transformations.xml b/src/lay/lay/doc/about/transformations.xml similarity index 100% rename from src/lay/doc/about/transformations.xml rename to src/lay/lay/doc/about/transformations.xml diff --git a/src/lay/doc/about/variant_notation.xml b/src/lay/lay/doc/about/variant_notation.xml similarity index 100% rename from src/lay/doc/about/variant_notation.xml rename to src/lay/lay/doc/about/variant_notation.xml diff --git a/src/lay/doc/help_format.css b/src/lay/lay/doc/help_format.css similarity index 100% rename from src/lay/doc/help_format.css rename to src/lay/lay/doc/help_format.css diff --git a/src/lay/doc/images/drc_and1.png b/src/lay/lay/doc/images/drc_and1.png similarity index 100% rename from src/lay/doc/images/drc_and1.png rename to src/lay/lay/doc/images/drc_and1.png diff --git a/src/lay/doc/images/drc_and2.png b/src/lay/lay/doc/images/drc_and2.png similarity index 100% rename from src/lay/doc/images/drc_and2.png rename to src/lay/lay/doc/images/drc_and2.png diff --git a/src/lay/doc/images/drc_and3.png b/src/lay/lay/doc/images/drc_and3.png similarity index 100% rename from src/lay/doc/images/drc_and3.png rename to src/lay/lay/doc/images/drc_and3.png diff --git a/src/lay/doc/images/drc_centers1.png b/src/lay/lay/doc/images/drc_centers1.png similarity index 100% rename from src/lay/doc/images/drc_centers1.png rename to src/lay/lay/doc/images/drc_centers1.png diff --git a/src/lay/doc/images/drc_centers2.png b/src/lay/lay/doc/images/drc_centers2.png similarity index 100% rename from src/lay/doc/images/drc_centers2.png rename to src/lay/lay/doc/images/drc_centers2.png diff --git a/src/lay/doc/images/drc_corners1.png b/src/lay/lay/doc/images/drc_corners1.png similarity index 100% rename from src/lay/doc/images/drc_corners1.png rename to src/lay/lay/doc/images/drc_corners1.png diff --git a/src/lay/doc/images/drc_corners2.png b/src/lay/lay/doc/images/drc_corners2.png similarity index 100% rename from src/lay/doc/images/drc_corners2.png rename to src/lay/lay/doc/images/drc_corners2.png diff --git a/src/lay/doc/images/drc_corners3.png b/src/lay/lay/doc/images/drc_corners3.png similarity index 100% rename from src/lay/doc/images/drc_corners3.png rename to src/lay/lay/doc/images/drc_corners3.png diff --git a/src/lay/doc/images/drc_enc1.png b/src/lay/lay/doc/images/drc_enc1.png similarity index 100% rename from src/lay/doc/images/drc_enc1.png rename to src/lay/lay/doc/images/drc_enc1.png diff --git a/src/lay/doc/images/drc_enc2.png b/src/lay/lay/doc/images/drc_enc2.png similarity index 100% rename from src/lay/doc/images/drc_enc2.png rename to src/lay/lay/doc/images/drc_enc2.png diff --git a/src/lay/doc/images/drc_end_segments1.png b/src/lay/lay/doc/images/drc_end_segments1.png similarity index 100% rename from src/lay/doc/images/drc_end_segments1.png rename to src/lay/lay/doc/images/drc_end_segments1.png diff --git a/src/lay/doc/images/drc_end_segments2.png b/src/lay/lay/doc/images/drc_end_segments2.png similarity index 100% rename from src/lay/doc/images/drc_end_segments2.png rename to src/lay/lay/doc/images/drc_end_segments2.png diff --git a/src/lay/doc/images/drc_extended1.png b/src/lay/lay/doc/images/drc_extended1.png similarity index 100% rename from src/lay/doc/images/drc_extended1.png rename to src/lay/lay/doc/images/drc_extended1.png diff --git a/src/lay/doc/images/drc_extended2.png b/src/lay/lay/doc/images/drc_extended2.png similarity index 100% rename from src/lay/doc/images/drc_extended2.png rename to src/lay/lay/doc/images/drc_extended2.png diff --git a/src/lay/doc/images/drc_extended3.png b/src/lay/lay/doc/images/drc_extended3.png similarity index 100% rename from src/lay/doc/images/drc_extended3.png rename to src/lay/lay/doc/images/drc_extended3.png diff --git a/src/lay/doc/images/drc_extended4.png b/src/lay/lay/doc/images/drc_extended4.png similarity index 100% rename from src/lay/doc/images/drc_extended4.png rename to src/lay/lay/doc/images/drc_extended4.png diff --git a/src/lay/doc/images/drc_extent_refs1.png b/src/lay/lay/doc/images/drc_extent_refs1.png similarity index 100% rename from src/lay/doc/images/drc_extent_refs1.png rename to src/lay/lay/doc/images/drc_extent_refs1.png diff --git a/src/lay/doc/images/drc_extent_refs10.png b/src/lay/lay/doc/images/drc_extent_refs10.png similarity index 100% rename from src/lay/doc/images/drc_extent_refs10.png rename to src/lay/lay/doc/images/drc_extent_refs10.png diff --git a/src/lay/doc/images/drc_extent_refs11.png b/src/lay/lay/doc/images/drc_extent_refs11.png similarity index 100% rename from src/lay/doc/images/drc_extent_refs11.png rename to src/lay/lay/doc/images/drc_extent_refs11.png diff --git a/src/lay/doc/images/drc_extent_refs12.png b/src/lay/lay/doc/images/drc_extent_refs12.png similarity index 100% rename from src/lay/doc/images/drc_extent_refs12.png rename to src/lay/lay/doc/images/drc_extent_refs12.png diff --git a/src/lay/doc/images/drc_extent_refs13.png b/src/lay/lay/doc/images/drc_extent_refs13.png similarity index 100% rename from src/lay/doc/images/drc_extent_refs13.png rename to src/lay/lay/doc/images/drc_extent_refs13.png diff --git a/src/lay/doc/images/drc_extent_refs20.png b/src/lay/lay/doc/images/drc_extent_refs20.png similarity index 100% rename from src/lay/doc/images/drc_extent_refs20.png rename to src/lay/lay/doc/images/drc_extent_refs20.png diff --git a/src/lay/doc/images/drc_extent_refs21.png b/src/lay/lay/doc/images/drc_extent_refs21.png similarity index 100% rename from src/lay/doc/images/drc_extent_refs21.png rename to src/lay/lay/doc/images/drc_extent_refs21.png diff --git a/src/lay/doc/images/drc_extent_refs22.png b/src/lay/lay/doc/images/drc_extent_refs22.png similarity index 100% rename from src/lay/doc/images/drc_extent_refs22.png rename to src/lay/lay/doc/images/drc_extent_refs22.png diff --git a/src/lay/doc/images/drc_extent_refs23.png b/src/lay/lay/doc/images/drc_extent_refs23.png similarity index 100% rename from src/lay/doc/images/drc_extent_refs23.png rename to src/lay/lay/doc/images/drc_extent_refs23.png diff --git a/src/lay/doc/images/drc_extent_refs24.png b/src/lay/lay/doc/images/drc_extent_refs24.png similarity index 100% rename from src/lay/doc/images/drc_extent_refs24.png rename to src/lay/lay/doc/images/drc_extent_refs24.png diff --git a/src/lay/doc/images/drc_extent_refs25.png b/src/lay/lay/doc/images/drc_extent_refs25.png similarity index 100% rename from src/lay/doc/images/drc_extent_refs25.png rename to src/lay/lay/doc/images/drc_extent_refs25.png diff --git a/src/lay/doc/images/drc_extent_refs26.png b/src/lay/lay/doc/images/drc_extent_refs26.png similarity index 100% rename from src/lay/doc/images/drc_extent_refs26.png rename to src/lay/lay/doc/images/drc_extent_refs26.png diff --git a/src/lay/doc/images/drc_extent_refs27.png b/src/lay/lay/doc/images/drc_extent_refs27.png similarity index 100% rename from src/lay/doc/images/drc_extent_refs27.png rename to src/lay/lay/doc/images/drc_extent_refs27.png diff --git a/src/lay/doc/images/drc_extent_refs30.png b/src/lay/lay/doc/images/drc_extent_refs30.png similarity index 100% rename from src/lay/doc/images/drc_extent_refs30.png rename to src/lay/lay/doc/images/drc_extent_refs30.png diff --git a/src/lay/doc/images/drc_extent_refs31.png b/src/lay/lay/doc/images/drc_extent_refs31.png similarity index 100% rename from src/lay/doc/images/drc_extent_refs31.png rename to src/lay/lay/doc/images/drc_extent_refs31.png diff --git a/src/lay/doc/images/drc_extents1.png b/src/lay/lay/doc/images/drc_extents1.png similarity index 100% rename from src/lay/doc/images/drc_extents1.png rename to src/lay/lay/doc/images/drc_extents1.png diff --git a/src/lay/doc/images/drc_extents2.png b/src/lay/lay/doc/images/drc_extents2.png similarity index 100% rename from src/lay/doc/images/drc_extents2.png rename to src/lay/lay/doc/images/drc_extents2.png diff --git a/src/lay/doc/images/drc_holes.png b/src/lay/lay/doc/images/drc_holes.png similarity index 100% rename from src/lay/doc/images/drc_holes.png rename to src/lay/lay/doc/images/drc_holes.png diff --git a/src/lay/doc/images/drc_hulls.png b/src/lay/lay/doc/images/drc_hulls.png similarity index 100% rename from src/lay/doc/images/drc_hulls.png rename to src/lay/lay/doc/images/drc_hulls.png diff --git a/src/lay/doc/images/drc_in.png b/src/lay/lay/doc/images/drc_in.png similarity index 100% rename from src/lay/doc/images/drc_in.png rename to src/lay/lay/doc/images/drc_in.png diff --git a/src/lay/doc/images/drc_inside.png b/src/lay/lay/doc/images/drc_inside.png similarity index 100% rename from src/lay/doc/images/drc_inside.png rename to src/lay/lay/doc/images/drc_inside.png diff --git a/src/lay/doc/images/drc_inside_part.png b/src/lay/lay/doc/images/drc_inside_part.png similarity index 100% rename from src/lay/doc/images/drc_inside_part.png rename to src/lay/lay/doc/images/drc_inside_part.png diff --git a/src/lay/doc/images/drc_interacting.png b/src/lay/lay/doc/images/drc_interacting.png similarity index 100% rename from src/lay/doc/images/drc_interacting.png rename to src/lay/lay/doc/images/drc_interacting.png diff --git a/src/lay/doc/images/drc_join1.png b/src/lay/lay/doc/images/drc_join1.png similarity index 100% rename from src/lay/doc/images/drc_join1.png rename to src/lay/lay/doc/images/drc_join1.png diff --git a/src/lay/doc/images/drc_join2.png b/src/lay/lay/doc/images/drc_join2.png similarity index 100% rename from src/lay/doc/images/drc_join2.png rename to src/lay/lay/doc/images/drc_join2.png diff --git a/src/lay/doc/images/drc_merged1.png b/src/lay/lay/doc/images/drc_merged1.png similarity index 100% rename from src/lay/doc/images/drc_merged1.png rename to src/lay/lay/doc/images/drc_merged1.png diff --git a/src/lay/doc/images/drc_merged2.png b/src/lay/lay/doc/images/drc_merged2.png similarity index 100% rename from src/lay/doc/images/drc_merged2.png rename to src/lay/lay/doc/images/drc_merged2.png diff --git a/src/lay/doc/images/drc_merged3.png b/src/lay/lay/doc/images/drc_merged3.png similarity index 100% rename from src/lay/doc/images/drc_merged3.png rename to src/lay/lay/doc/images/drc_merged3.png diff --git a/src/lay/doc/images/drc_merged4.png b/src/lay/lay/doc/images/drc_merged4.png similarity index 100% rename from src/lay/doc/images/drc_merged4.png rename to src/lay/lay/doc/images/drc_merged4.png diff --git a/src/lay/doc/images/drc_middle1.png b/src/lay/lay/doc/images/drc_middle1.png similarity index 100% rename from src/lay/doc/images/drc_middle1.png rename to src/lay/lay/doc/images/drc_middle1.png diff --git a/src/lay/doc/images/drc_moved1.png b/src/lay/lay/doc/images/drc_moved1.png similarity index 100% rename from src/lay/doc/images/drc_moved1.png rename to src/lay/lay/doc/images/drc_moved1.png diff --git a/src/lay/doc/images/drc_not1.png b/src/lay/lay/doc/images/drc_not1.png similarity index 100% rename from src/lay/doc/images/drc_not1.png rename to src/lay/lay/doc/images/drc_not1.png diff --git a/src/lay/doc/images/drc_not2.png b/src/lay/lay/doc/images/drc_not2.png similarity index 100% rename from src/lay/doc/images/drc_not2.png rename to src/lay/lay/doc/images/drc_not2.png diff --git a/src/lay/doc/images/drc_not3.png b/src/lay/lay/doc/images/drc_not3.png similarity index 100% rename from src/lay/doc/images/drc_not3.png rename to src/lay/lay/doc/images/drc_not3.png diff --git a/src/lay/doc/images/drc_not_in.png b/src/lay/lay/doc/images/drc_not_in.png similarity index 100% rename from src/lay/doc/images/drc_not_in.png rename to src/lay/lay/doc/images/drc_not_in.png diff --git a/src/lay/doc/images/drc_not_inside.png b/src/lay/lay/doc/images/drc_not_inside.png similarity index 100% rename from src/lay/doc/images/drc_not_inside.png rename to src/lay/lay/doc/images/drc_not_inside.png diff --git a/src/lay/doc/images/drc_not_interacting.png b/src/lay/lay/doc/images/drc_not_interacting.png similarity index 100% rename from src/lay/doc/images/drc_not_interacting.png rename to src/lay/lay/doc/images/drc_not_interacting.png diff --git a/src/lay/doc/images/drc_not_outside.png b/src/lay/lay/doc/images/drc_not_outside.png similarity index 100% rename from src/lay/doc/images/drc_not_outside.png rename to src/lay/lay/doc/images/drc_not_outside.png diff --git a/src/lay/doc/images/drc_not_overlapping.png b/src/lay/lay/doc/images/drc_not_overlapping.png similarity index 100% rename from src/lay/doc/images/drc_not_overlapping.png rename to src/lay/lay/doc/images/drc_not_overlapping.png diff --git a/src/lay/doc/images/drc_or1.png b/src/lay/lay/doc/images/drc_or1.png similarity index 100% rename from src/lay/doc/images/drc_or1.png rename to src/lay/lay/doc/images/drc_or1.png diff --git a/src/lay/doc/images/drc_or2.png b/src/lay/lay/doc/images/drc_or2.png similarity index 100% rename from src/lay/doc/images/drc_or2.png rename to src/lay/lay/doc/images/drc_or2.png diff --git a/src/lay/doc/images/drc_outside.png b/src/lay/lay/doc/images/drc_outside.png similarity index 100% rename from src/lay/doc/images/drc_outside.png rename to src/lay/lay/doc/images/drc_outside.png diff --git a/src/lay/doc/images/drc_outside_part.png b/src/lay/lay/doc/images/drc_outside_part.png similarity index 100% rename from src/lay/doc/images/drc_outside_part.png rename to src/lay/lay/doc/images/drc_outside_part.png diff --git a/src/lay/doc/images/drc_overlap1.png b/src/lay/lay/doc/images/drc_overlap1.png similarity index 100% rename from src/lay/doc/images/drc_overlap1.png rename to src/lay/lay/doc/images/drc_overlap1.png diff --git a/src/lay/doc/images/drc_overlap2.png b/src/lay/lay/doc/images/drc_overlap2.png similarity index 100% rename from src/lay/doc/images/drc_overlap2.png rename to src/lay/lay/doc/images/drc_overlap2.png diff --git a/src/lay/doc/images/drc_overlapping.png b/src/lay/lay/doc/images/drc_overlapping.png similarity index 100% rename from src/lay/doc/images/drc_overlapping.png rename to src/lay/lay/doc/images/drc_overlapping.png diff --git a/src/lay/doc/images/drc_raw1.png b/src/lay/lay/doc/images/drc_raw1.png similarity index 100% rename from src/lay/doc/images/drc_raw1.png rename to src/lay/lay/doc/images/drc_raw1.png diff --git a/src/lay/doc/images/drc_raw2.png b/src/lay/lay/doc/images/drc_raw2.png similarity index 100% rename from src/lay/doc/images/drc_raw2.png rename to src/lay/lay/doc/images/drc_raw2.png diff --git a/src/lay/doc/images/drc_raw3.png b/src/lay/lay/doc/images/drc_raw3.png similarity index 100% rename from src/lay/doc/images/drc_raw3.png rename to src/lay/lay/doc/images/drc_raw3.png diff --git a/src/lay/doc/images/drc_rotated1.png b/src/lay/lay/doc/images/drc_rotated1.png similarity index 100% rename from src/lay/doc/images/drc_rotated1.png rename to src/lay/lay/doc/images/drc_rotated1.png diff --git a/src/lay/doc/images/drc_rounded_corners.png b/src/lay/lay/doc/images/drc_rounded_corners.png similarity index 100% rename from src/lay/doc/images/drc_rounded_corners.png rename to src/lay/lay/doc/images/drc_rounded_corners.png diff --git a/src/lay/doc/images/drc_scaled1.png b/src/lay/lay/doc/images/drc_scaled1.png similarity index 100% rename from src/lay/doc/images/drc_scaled1.png rename to src/lay/lay/doc/images/drc_scaled1.png diff --git a/src/lay/doc/images/drc_separation1.png b/src/lay/lay/doc/images/drc_separation1.png similarity index 100% rename from src/lay/doc/images/drc_separation1.png rename to src/lay/lay/doc/images/drc_separation1.png diff --git a/src/lay/doc/images/drc_sized1.png b/src/lay/lay/doc/images/drc_sized1.png similarity index 100% rename from src/lay/doc/images/drc_sized1.png rename to src/lay/lay/doc/images/drc_sized1.png diff --git a/src/lay/doc/images/drc_sized2.png b/src/lay/lay/doc/images/drc_sized2.png similarity index 100% rename from src/lay/doc/images/drc_sized2.png rename to src/lay/lay/doc/images/drc_sized2.png diff --git a/src/lay/doc/images/drc_sized3.png b/src/lay/lay/doc/images/drc_sized3.png similarity index 100% rename from src/lay/doc/images/drc_sized3.png rename to src/lay/lay/doc/images/drc_sized3.png diff --git a/src/lay/doc/images/drc_sized4.png b/src/lay/lay/doc/images/drc_sized4.png similarity index 100% rename from src/lay/doc/images/drc_sized4.png rename to src/lay/lay/doc/images/drc_sized4.png diff --git a/src/lay/doc/images/drc_sized5.png b/src/lay/lay/doc/images/drc_sized5.png similarity index 100% rename from src/lay/doc/images/drc_sized5.png rename to src/lay/lay/doc/images/drc_sized5.png diff --git a/src/lay/doc/images/drc_sized6.png b/src/lay/lay/doc/images/drc_sized6.png similarity index 100% rename from src/lay/doc/images/drc_sized6.png rename to src/lay/lay/doc/images/drc_sized6.png diff --git a/src/lay/doc/images/drc_space1.png b/src/lay/lay/doc/images/drc_space1.png similarity index 100% rename from src/lay/doc/images/drc_space1.png rename to src/lay/lay/doc/images/drc_space1.png diff --git a/src/lay/doc/images/drc_space2.png b/src/lay/lay/doc/images/drc_space2.png similarity index 100% rename from src/lay/doc/images/drc_space2.png rename to src/lay/lay/doc/images/drc_space2.png diff --git a/src/lay/doc/images/drc_space3.png b/src/lay/lay/doc/images/drc_space3.png similarity index 100% rename from src/lay/doc/images/drc_space3.png rename to src/lay/lay/doc/images/drc_space3.png diff --git a/src/lay/doc/images/drc_start_segments1.png b/src/lay/lay/doc/images/drc_start_segments1.png similarity index 100% rename from src/lay/doc/images/drc_start_segments1.png rename to src/lay/lay/doc/images/drc_start_segments1.png diff --git a/src/lay/doc/images/drc_start_segments2.png b/src/lay/lay/doc/images/drc_start_segments2.png similarity index 100% rename from src/lay/doc/images/drc_start_segments2.png rename to src/lay/lay/doc/images/drc_start_segments2.png diff --git a/src/lay/doc/images/drc_transformed1.png b/src/lay/lay/doc/images/drc_transformed1.png similarity index 100% rename from src/lay/doc/images/drc_transformed1.png rename to src/lay/lay/doc/images/drc_transformed1.png diff --git a/src/lay/doc/images/drc_width1.png b/src/lay/lay/doc/images/drc_width1.png similarity index 100% rename from src/lay/doc/images/drc_width1.png rename to src/lay/lay/doc/images/drc_width1.png diff --git a/src/lay/doc/images/drc_width2.png b/src/lay/lay/doc/images/drc_width2.png similarity index 100% rename from src/lay/doc/images/drc_width2.png rename to src/lay/lay/doc/images/drc_width2.png diff --git a/src/lay/doc/images/drc_width3.png b/src/lay/lay/doc/images/drc_width3.png similarity index 100% rename from src/lay/doc/images/drc_width3.png rename to src/lay/lay/doc/images/drc_width3.png diff --git a/src/lay/doc/images/drc_width4.png b/src/lay/lay/doc/images/drc_width4.png similarity index 100% rename from src/lay/doc/images/drc_width4.png rename to src/lay/lay/doc/images/drc_width4.png diff --git a/src/lay/doc/images/drc_with_angle1.png b/src/lay/lay/doc/images/drc_with_angle1.png similarity index 100% rename from src/lay/doc/images/drc_with_angle1.png rename to src/lay/lay/doc/images/drc_with_angle1.png diff --git a/src/lay/doc/images/drc_with_angle2.png b/src/lay/lay/doc/images/drc_with_angle2.png similarity index 100% rename from src/lay/doc/images/drc_with_angle2.png rename to src/lay/lay/doc/images/drc_with_angle2.png diff --git a/src/lay/doc/images/drc_with_angle3.png b/src/lay/lay/doc/images/drc_with_angle3.png similarity index 100% rename from src/lay/doc/images/drc_with_angle3.png rename to src/lay/lay/doc/images/drc_with_angle3.png diff --git a/src/lay/doc/images/drc_with_angle4.png b/src/lay/lay/doc/images/drc_with_angle4.png similarity index 100% rename from src/lay/doc/images/drc_with_angle4.png rename to src/lay/lay/doc/images/drc_with_angle4.png diff --git a/src/lay/doc/images/drc_xor1.png b/src/lay/lay/doc/images/drc_xor1.png similarity index 100% rename from src/lay/doc/images/drc_xor1.png rename to src/lay/lay/doc/images/drc_xor1.png diff --git a/src/lay/doc/images/drc_xor2.png b/src/lay/lay/doc/images/drc_xor2.png similarity index 100% rename from src/lay/doc/images/drc_xor2.png rename to src/lay/lay/doc/images/drc_xor2.png diff --git a/src/lay/doc/manual/adjust_origin.xml b/src/lay/lay/doc/manual/adjust_origin.xml similarity index 100% rename from src/lay/doc/manual/adjust_origin.xml rename to src/lay/lay/doc/manual/adjust_origin.xml diff --git a/src/lay/doc/manual/advanced.xml b/src/lay/lay/doc/manual/advanced.xml similarity index 100% rename from src/lay/doc/manual/advanced.xml rename to src/lay/lay/doc/manual/advanced.xml diff --git a/src/lay/doc/manual/background_combination_modes.png b/src/lay/lay/doc/manual/background_combination_modes.png similarity index 100% rename from src/lay/doc/manual/background_combination_modes.png rename to src/lay/lay/doc/manual/background_combination_modes.png diff --git a/src/lay/doc/manual/background_modes.xml b/src/lay/lay/doc/manual/background_modes.xml similarity index 100% rename from src/lay/doc/manual/background_modes.xml rename to src/lay/lay/doc/manual/background_modes.xml diff --git a/src/lay/doc/manual/basic.xml b/src/lay/lay/doc/manual/basic.xml similarity index 100% rename from src/lay/doc/manual/basic.xml rename to src/lay/lay/doc/manual/basic.xml diff --git a/src/lay/doc/manual/bookmarks.xml b/src/lay/lay/doc/manual/bookmarks.xml similarity index 100% rename from src/lay/doc/manual/bookmarks.xml rename to src/lay/lay/doc/manual/bookmarks.xml diff --git a/src/lay/doc/manual/browse_instances.xml b/src/lay/lay/doc/manual/browse_instances.xml similarity index 100% rename from src/lay/doc/manual/browse_instances.xml rename to src/lay/lay/doc/manual/browse_instances.xml diff --git a/src/lay/doc/manual/browse_shapes.xml b/src/lay/lay/doc/manual/browse_shapes.xml similarity index 100% rename from src/lay/doc/manual/browse_shapes.xml rename to src/lay/lay/doc/manual/browse_shapes.xml diff --git a/src/lay/doc/manual/cell.xml b/src/lay/lay/doc/manual/cell.xml similarity index 100% rename from src/lay/doc/manual/cell.xml rename to src/lay/lay/doc/manual/cell.xml diff --git a/src/lay/doc/manual/cell_list.xml b/src/lay/lay/doc/manual/cell_list.xml similarity index 100% rename from src/lay/doc/manual/cell_list.xml rename to src/lay/lay/doc/manual/cell_list.xml diff --git a/src/lay/doc/manual/clip.xml b/src/lay/lay/doc/manual/clip.xml similarity index 100% rename from src/lay/doc/manual/clip.xml rename to src/lay/lay/doc/manual/clip.xml diff --git a/src/lay/doc/manual/copypaste_cell.xml b/src/lay/lay/doc/manual/copypaste_cell.xml similarity index 100% rename from src/lay/doc/manual/copypaste_cell.xml rename to src/lay/lay/doc/manual/copypaste_cell.xml diff --git a/src/lay/doc/manual/copypaste_sel.xml b/src/lay/lay/doc/manual/copypaste_sel.xml similarity index 100% rename from src/lay/doc/manual/copypaste_sel.xml rename to src/lay/lay/doc/manual/copypaste_sel.xml diff --git a/src/lay/doc/manual/create_box.xml b/src/lay/lay/doc/manual/create_box.xml similarity index 100% rename from src/lay/doc/manual/create_box.xml rename to src/lay/lay/doc/manual/create_box.xml diff --git a/src/lay/doc/manual/create_cells.xml b/src/lay/lay/doc/manual/create_cells.xml similarity index 100% rename from src/lay/doc/manual/create_cells.xml rename to src/lay/lay/doc/manual/create_cells.xml diff --git a/src/lay/doc/manual/create_cv1.png b/src/lay/lay/doc/manual/create_cv1.png similarity index 100% rename from src/lay/doc/manual/create_cv1.png rename to src/lay/lay/doc/manual/create_cv1.png diff --git a/src/lay/doc/manual/create_cv2.png b/src/lay/lay/doc/manual/create_cv2.png similarity index 100% rename from src/lay/doc/manual/create_cv2.png rename to src/lay/lay/doc/manual/create_cv2.png diff --git a/src/lay/doc/manual/create_cv3.png b/src/lay/lay/doc/manual/create_cv3.png similarity index 100% rename from src/lay/doc/manual/create_cv3.png rename to src/lay/lay/doc/manual/create_cv3.png diff --git a/src/lay/doc/manual/create_cv4.png b/src/lay/lay/doc/manual/create_cv4.png similarity index 100% rename from src/lay/doc/manual/create_cv4.png rename to src/lay/lay/doc/manual/create_cv4.png diff --git a/src/lay/doc/manual/create_from_scratch.xml b/src/lay/lay/doc/manual/create_from_scratch.xml similarity index 100% rename from src/lay/doc/manual/create_from_scratch.xml rename to src/lay/lay/doc/manual/create_from_scratch.xml diff --git a/src/lay/doc/manual/create_instance.xml b/src/lay/lay/doc/manual/create_instance.xml similarity index 100% rename from src/lay/doc/manual/create_instance.xml rename to src/lay/lay/doc/manual/create_instance.xml diff --git a/src/lay/doc/manual/create_layers.xml b/src/lay/lay/doc/manual/create_layers.xml similarity index 100% rename from src/lay/doc/manual/create_layers.xml rename to src/lay/lay/doc/manual/create_layers.xml diff --git a/src/lay/doc/manual/create_path.xml b/src/lay/lay/doc/manual/create_path.xml similarity index 100% rename from src/lay/doc/manual/create_path.xml rename to src/lay/lay/doc/manual/create_path.xml diff --git a/src/lay/doc/manual/create_polygon.xml b/src/lay/lay/doc/manual/create_polygon.xml similarity index 100% rename from src/lay/doc/manual/create_polygon.xml rename to src/lay/lay/doc/manual/create_polygon.xml diff --git a/src/lay/doc/manual/create_text.xml b/src/lay/lay/doc/manual/create_text.xml similarity index 100% rename from src/lay/doc/manual/create_text.xml rename to src/lay/lay/doc/manual/create_text.xml diff --git a/src/lay/doc/manual/create_variants.xml b/src/lay/lay/doc/manual/create_variants.xml similarity index 100% rename from src/lay/doc/manual/create_variants.xml rename to src/lay/lay/doc/manual/create_variants.xml diff --git a/src/lay/doc/manual/del_cell.xml b/src/lay/lay/doc/manual/del_cell.xml similarity index 100% rename from src/lay/doc/manual/del_cell.xml rename to src/lay/lay/doc/manual/del_cell.xml diff --git a/src/lay/doc/manual/descend.xml b/src/lay/lay/doc/manual/descend.xml similarity index 100% rename from src/lay/doc/manual/descend.xml rename to src/lay/lay/doc/manual/descend.xml diff --git a/src/lay/doc/manual/diff.xml b/src/lay/lay/doc/manual/diff.xml similarity index 100% rename from src/lay/doc/manual/diff.xml rename to src/lay/lay/doc/manual/diff.xml diff --git a/src/lay/doc/manual/drc.xml b/src/lay/lay/doc/manual/drc.xml similarity index 100% rename from src/lay/doc/manual/drc.xml rename to src/lay/lay/doc/manual/drc.xml diff --git a/src/lay/doc/manual/drc_basic.xml b/src/lay/lay/doc/manual/drc_basic.xml similarity index 100% rename from src/lay/doc/manual/drc_basic.xml rename to src/lay/lay/doc/manual/drc_basic.xml diff --git a/src/lay/doc/manual/drc_runsets.xml b/src/lay/lay/doc/manual/drc_runsets.xml similarity index 100% rename from src/lay/doc/manual/drc_runsets.xml rename to src/lay/lay/doc/manual/drc_runsets.xml diff --git a/src/lay/doc/manual/edit_mode.xml b/src/lay/lay/doc/manual/edit_mode.xml similarity index 100% rename from src/lay/doc/manual/edit_mode.xml rename to src/lay/lay/doc/manual/edit_mode.xml diff --git a/src/lay/doc/manual/editor.xml b/src/lay/lay/doc/manual/editor.xml similarity index 100% rename from src/lay/doc/manual/editor.xml rename to src/lay/lay/doc/manual/editor.xml diff --git a/src/lay/doc/manual/editor_advanced.xml b/src/lay/lay/doc/manual/editor_advanced.xml similarity index 100% rename from src/lay/doc/manual/editor_advanced.xml rename to src/lay/lay/doc/manual/editor_advanced.xml diff --git a/src/lay/doc/manual/editor_basics.xml b/src/lay/lay/doc/manual/editor_basics.xml similarity index 100% rename from src/lay/doc/manual/editor_basics.xml rename to src/lay/lay/doc/manual/editor_basics.xml diff --git a/src/lay/doc/manual/editor_operations.xml b/src/lay/lay/doc/manual/editor_operations.xml similarity index 100% rename from src/lay/doc/manual/editor_operations.xml rename to src/lay/lay/doc/manual/editor_operations.xml diff --git a/src/lay/doc/manual/editor_options.xml b/src/lay/lay/doc/manual/editor_options.xml similarity index 100% rename from src/lay/doc/manual/editor_options.xml rename to src/lay/lay/doc/manual/editor_options.xml diff --git a/src/lay/doc/manual/editor_selection.xml b/src/lay/lay/doc/manual/editor_selection.xml similarity index 100% rename from src/lay/doc/manual/editor_selection.xml rename to src/lay/lay/doc/manual/editor_selection.xml diff --git a/src/lay/doc/manual/explicit_hier_levels.xml b/src/lay/lay/doc/manual/explicit_hier_levels.xml similarity index 100% rename from src/lay/doc/manual/explicit_hier_levels.xml rename to src/lay/lay/doc/manual/explicit_hier_levels.xml diff --git a/src/lay/doc/manual/fill_default.png b/src/lay/lay/doc/manual/fill_default.png similarity index 100% rename from src/lay/doc/manual/fill_default.png rename to src/lay/lay/doc/manual/fill_default.png diff --git a/src/lay/doc/manual/fill_enhanced.png b/src/lay/lay/doc/manual/fill_enhanced.png similarity index 100% rename from src/lay/doc/manual/fill_enhanced.png rename to src/lay/lay/doc/manual/fill_enhanced.png diff --git a/src/lay/doc/manual/fill_second_order.png b/src/lay/lay/doc/manual/fill_second_order.png similarity index 100% rename from src/lay/doc/manual/fill_second_order.png rename to src/lay/lay/doc/manual/fill_second_order.png diff --git a/src/lay/doc/manual/flatten.xml b/src/lay/lay/doc/manual/flatten.xml similarity index 100% rename from src/lay/doc/manual/flatten.xml rename to src/lay/lay/doc/manual/flatten.xml diff --git a/src/lay/doc/manual/global_trans.xml b/src/lay/lay/doc/manual/global_trans.xml similarity index 100% rename from src/lay/doc/manual/global_trans.xml rename to src/lay/lay/doc/manual/global_trans.xml diff --git a/src/lay/doc/manual/hiding.xml b/src/lay/lay/doc/manual/hiding.xml similarity index 100% rename from src/lay/doc/manual/hiding.xml rename to src/lay/lay/doc/manual/hiding.xml diff --git a/src/lay/doc/manual/hier.xml b/src/lay/lay/doc/manual/hier.xml similarity index 100% rename from src/lay/doc/manual/hier.xml rename to src/lay/lay/doc/manual/hier.xml diff --git a/src/lay/doc/manual/hier_ops.xml b/src/lay/lay/doc/manual/hier_ops.xml similarity index 100% rename from src/lay/doc/manual/hier_ops.xml rename to src/lay/lay/doc/manual/hier_ops.xml diff --git a/src/lay/doc/manual/hierarchy_panel.png b/src/lay/lay/doc/manual/hierarchy_panel.png similarity index 100% rename from src/lay/doc/manual/hierarchy_panel.png rename to src/lay/lay/doc/manual/hierarchy_panel.png diff --git a/src/lay/doc/manual/images.xml b/src/lay/lay/doc/manual/images.xml similarity index 100% rename from src/lay/doc/manual/images.xml rename to src/lay/lay/doc/manual/images.xml diff --git a/src/lay/doc/manual/import_gerber.xml b/src/lay/lay/doc/manual/import_gerber.xml similarity index 100% rename from src/lay/doc/manual/import_gerber.xml rename to src/lay/lay/doc/manual/import_gerber.xml diff --git a/src/lay/doc/manual/import_layout.xml b/src/lay/lay/doc/manual/import_layout.xml similarity index 100% rename from src/lay/doc/manual/import_layout.xml rename to src/lay/lay/doc/manual/import_layout.xml diff --git a/src/lay/doc/manual/index.xml b/src/lay/lay/doc/manual/index.xml similarity index 100% rename from src/lay/doc/manual/index.xml rename to src/lay/lay/doc/manual/index.xml diff --git a/src/lay/doc/manual/landmarks.xml b/src/lay/lay/doc/manual/landmarks.xml similarity index 100% rename from src/lay/doc/manual/landmarks.xml rename to src/lay/lay/doc/manual/landmarks.xml diff --git a/src/lay/doc/manual/layer_animation.xml b/src/lay/lay/doc/manual/layer_animation.xml similarity index 100% rename from src/lay/doc/manual/layer_animation.xml rename to src/lay/lay/doc/manual/layer_animation.xml diff --git a/src/lay/doc/manual/layer_boolean.xml b/src/lay/lay/doc/manual/layer_boolean.xml similarity index 100% rename from src/lay/doc/manual/layer_boolean.xml rename to src/lay/lay/doc/manual/layer_boolean.xml diff --git a/src/lay/doc/manual/layer_color.xml b/src/lay/lay/doc/manual/layer_color.xml similarity index 100% rename from src/lay/doc/manual/layer_color.xml rename to src/lay/lay/doc/manual/layer_color.xml diff --git a/src/lay/doc/manual/layer_content.xml b/src/lay/lay/doc/manual/layer_content.xml similarity index 100% rename from src/lay/doc/manual/layer_content.xml rename to src/lay/lay/doc/manual/layer_content.xml diff --git a/src/lay/doc/manual/layer_fill.xml b/src/lay/lay/doc/manual/layer_fill.xml similarity index 100% rename from src/lay/doc/manual/layer_fill.xml rename to src/lay/lay/doc/manual/layer_fill.xml diff --git a/src/lay/doc/manual/layer_hier.xml b/src/lay/lay/doc/manual/layer_hier.xml similarity index 100% rename from src/lay/doc/manual/layer_hier.xml rename to src/lay/lay/doc/manual/layer_hier.xml diff --git a/src/lay/doc/manual/layer_ops.xml b/src/lay/lay/doc/manual/layer_ops.xml similarity index 100% rename from src/lay/doc/manual/layer_ops.xml rename to src/lay/lay/doc/manual/layer_ops.xml diff --git a/src/lay/doc/manual/layer_order.xml b/src/lay/lay/doc/manual/layer_order.xml similarity index 100% rename from src/lay/doc/manual/layer_order.xml rename to src/lay/lay/doc/manual/layer_order.xml diff --git a/src/lay/doc/manual/layer_size.xml b/src/lay/lay/doc/manual/layer_size.xml similarity index 100% rename from src/lay/doc/manual/layer_size.xml rename to src/lay/lay/doc/manual/layer_size.xml diff --git a/src/lay/doc/manual/layer_source.xml b/src/lay/lay/doc/manual/layer_source.xml similarity index 100% rename from src/lay/doc/manual/layer_source.xml rename to src/lay/lay/doc/manual/layer_source.xml diff --git a/src/lay/doc/manual/layer_source_expert.xml b/src/lay/lay/doc/manual/layer_source_expert.xml similarity index 100% rename from src/lay/doc/manual/layer_source_expert.xml rename to src/lay/lay/doc/manual/layer_source_expert.xml diff --git a/src/lay/doc/manual/layer_style.xml b/src/lay/lay/doc/manual/layer_style.xml similarity index 100% rename from src/lay/doc/manual/layer_style.xml rename to src/lay/lay/doc/manual/layer_style.xml diff --git a/src/lay/doc/manual/layer_tabs.xml b/src/lay/lay/doc/manual/layer_tabs.xml similarity index 100% rename from src/lay/doc/manual/layer_tabs.xml rename to src/lay/lay/doc/manual/layer_tabs.xml diff --git a/src/lay/doc/manual/layer_validity.xml b/src/lay/lay/doc/manual/layer_validity.xml similarity index 100% rename from src/lay/doc/manual/layer_validity.xml rename to src/lay/lay/doc/manual/layer_validity.xml diff --git a/src/lay/doc/manual/layer_visibility.xml b/src/lay/lay/doc/manual/layer_visibility.xml similarity index 100% rename from src/lay/doc/manual/layer_visibility.xml rename to src/lay/lay/doc/manual/layer_visibility.xml diff --git a/src/lay/doc/manual/layout_transforms.xml b/src/lay/lay/doc/manual/layout_transforms.xml similarity index 100% rename from src/lay/doc/manual/layout_transforms.xml rename to src/lay/lay/doc/manual/layout_transforms.xml diff --git a/src/lay/doc/manual/line_style.xml b/src/lay/lay/doc/manual/line_style.xml similarity index 100% rename from src/lay/doc/manual/line_style.xml rename to src/lay/lay/doc/manual/line_style.xml diff --git a/src/lay/doc/manual/load_save_layers.xml b/src/lay/lay/doc/manual/load_save_layers.xml similarity index 100% rename from src/lay/doc/manual/load_save_layers.xml rename to src/lay/lay/doc/manual/load_save_layers.xml diff --git a/src/lay/doc/manual/loading.xml b/src/lay/lay/doc/manual/loading.xml similarity index 100% rename from src/lay/doc/manual/loading.xml rename to src/lay/lay/doc/manual/loading.xml diff --git a/src/lay/doc/manual/main_window.png b/src/lay/lay/doc/manual/main_window.png similarity index 100% rename from src/lay/doc/manual/main_window.png rename to src/lay/lay/doc/manual/main_window.png diff --git a/src/lay/doc/manual/main_window.xml b/src/lay/lay/doc/manual/main_window.xml similarity index 100% rename from src/lay/doc/manual/main_window.xml rename to src/lay/lay/doc/manual/main_window.xml diff --git a/src/lay/doc/manual/marker_browser.xml b/src/lay/lay/doc/manual/marker_browser.xml similarity index 100% rename from src/lay/doc/manual/marker_browser.xml rename to src/lay/lay/doc/manual/marker_browser.xml diff --git a/src/lay/doc/manual/max_coherence.png b/src/lay/lay/doc/manual/max_coherence.png similarity index 100% rename from src/lay/doc/manual/max_coherence.png rename to src/lay/lay/doc/manual/max_coherence.png diff --git a/src/lay/doc/manual/measure.xml b/src/lay/lay/doc/manual/measure.xml similarity index 100% rename from src/lay/doc/manual/measure.xml rename to src/lay/lay/doc/manual/measure.xml diff --git a/src/lay/doc/manual/min_coherence.png b/src/lay/lay/doc/manual/min_coherence.png similarity index 100% rename from src/lay/doc/manual/min_coherence.png rename to src/lay/lay/doc/manual/min_coherence.png diff --git a/src/lay/doc/manual/move_layer_sel.xml b/src/lay/lay/doc/manual/move_layer_sel.xml similarity index 100% rename from src/lay/doc/manual/move_layer_sel.xml rename to src/lay/lay/doc/manual/move_layer_sel.xml diff --git a/src/lay/doc/manual/move_sel.xml b/src/lay/lay/doc/manual/move_sel.xml similarity index 100% rename from src/lay/doc/manual/move_sel.xml rename to src/lay/lay/doc/manual/move_sel.xml diff --git a/src/lay/doc/manual/navigator.png b/src/lay/lay/doc/manual/navigator.png similarity index 100% rename from src/lay/doc/manual/navigator.png rename to src/lay/lay/doc/manual/navigator.png diff --git a/src/lay/doc/manual/net_tracing.xml b/src/lay/lay/doc/manual/net_tracing.xml similarity index 100% rename from src/lay/doc/manual/net_tracing.xml rename to src/lay/lay/doc/manual/net_tracing.xml diff --git a/src/lay/doc/manual/object_align.xml b/src/lay/lay/doc/manual/object_align.xml similarity index 100% rename from src/lay/doc/manual/object_align.xml rename to src/lay/lay/doc/manual/object_align.xml diff --git a/src/lay/doc/manual/panels.xml b/src/lay/lay/doc/manual/panels.xml similarity index 100% rename from src/lay/doc/manual/panels.xml rename to src/lay/lay/doc/manual/panels.xml diff --git a/src/lay/doc/manual/partial.xml b/src/lay/lay/doc/manual/partial.xml similarity index 100% rename from src/lay/doc/manual/partial.xml rename to src/lay/lay/doc/manual/partial.xml diff --git a/src/lay/doc/manual/partial_vs_full.xml b/src/lay/lay/doc/manual/partial_vs_full.xml similarity index 100% rename from src/lay/doc/manual/partial_vs_full.xml rename to src/lay/lay/doc/manual/partial_vs_full.xml diff --git a/src/lay/doc/manual/pcb_1x.png b/src/lay/lay/doc/manual/pcb_1x.png similarity index 100% rename from src/lay/doc/manual/pcb_1x.png rename to src/lay/lay/doc/manual/pcb_1x.png diff --git a/src/lay/doc/manual/pcb_2x.png b/src/lay/lay/doc/manual/pcb_2x.png similarity index 100% rename from src/lay/doc/manual/pcb_2x.png rename to src/lay/lay/doc/manual/pcb_2x.png diff --git a/src/lay/doc/manual/pcb_3x.png b/src/lay/lay/doc/manual/pcb_3x.png similarity index 100% rename from src/lay/doc/manual/pcb_3x.png rename to src/lay/lay/doc/manual/pcb_3x.png diff --git a/src/lay/doc/manual/pcb_import_free_flow_1.png b/src/lay/lay/doc/manual/pcb_import_free_flow_1.png similarity index 100% rename from src/lay/doc/manual/pcb_import_free_flow_1.png rename to src/lay/lay/doc/manual/pcb_import_free_flow_1.png diff --git a/src/lay/doc/manual/pcb_import_free_flow_2.png b/src/lay/lay/doc/manual/pcb_import_free_flow_2.png similarity index 100% rename from src/lay/doc/manual/pcb_import_free_flow_2.png rename to src/lay/lay/doc/manual/pcb_import_free_flow_2.png diff --git a/src/lay/doc/manual/pcb_import_free_flow_3.png b/src/lay/lay/doc/manual/pcb_import_free_flow_3.png similarity index 100% rename from src/lay/doc/manual/pcb_import_free_flow_3.png rename to src/lay/lay/doc/manual/pcb_import_free_flow_3.png diff --git a/src/lay/doc/manual/pcb_import_free_flow_4.png b/src/lay/lay/doc/manual/pcb_import_free_flow_4.png similarity index 100% rename from src/lay/doc/manual/pcb_import_free_flow_4.png rename to src/lay/lay/doc/manual/pcb_import_free_flow_4.png diff --git a/src/lay/doc/manual/pcb_import_free_flow_5.png b/src/lay/lay/doc/manual/pcb_import_free_flow_5.png similarity index 100% rename from src/lay/doc/manual/pcb_import_free_flow_5.png rename to src/lay/lay/doc/manual/pcb_import_free_flow_5.png diff --git a/src/lay/doc/manual/pcb_import_free_flow_6.png b/src/lay/lay/doc/manual/pcb_import_free_flow_6.png similarity index 100% rename from src/lay/doc/manual/pcb_import_free_flow_6.png rename to src/lay/lay/doc/manual/pcb_import_free_flow_6.png diff --git a/src/lay/doc/manual/pcb_import_free_flow_7.png b/src/lay/lay/doc/manual/pcb_import_free_flow_7.png similarity index 100% rename from src/lay/doc/manual/pcb_import_free_flow_7.png rename to src/lay/lay/doc/manual/pcb_import_free_flow_7.png diff --git a/src/lay/doc/manual/pcb_import_stack_flow_1.png b/src/lay/lay/doc/manual/pcb_import_stack_flow_1.png similarity index 100% rename from src/lay/doc/manual/pcb_import_stack_flow_1.png rename to src/lay/lay/doc/manual/pcb_import_stack_flow_1.png diff --git a/src/lay/doc/manual/pcb_import_stack_flow_2.png b/src/lay/lay/doc/manual/pcb_import_stack_flow_2.png similarity index 100% rename from src/lay/doc/manual/pcb_import_stack_flow_2.png rename to src/lay/lay/doc/manual/pcb_import_stack_flow_2.png diff --git a/src/lay/doc/manual/pcb_import_stack_flow_3.png b/src/lay/lay/doc/manual/pcb_import_stack_flow_3.png similarity index 100% rename from src/lay/doc/manual/pcb_import_stack_flow_3.png rename to src/lay/lay/doc/manual/pcb_import_stack_flow_3.png diff --git a/src/lay/doc/manual/pcb_import_stack_flow_4.png b/src/lay/lay/doc/manual/pcb_import_stack_flow_4.png similarity index 100% rename from src/lay/doc/manual/pcb_import_stack_flow_4.png rename to src/lay/lay/doc/manual/pcb_import_stack_flow_4.png diff --git a/src/lay/doc/manual/pcb_import_stack_flow_5.png b/src/lay/lay/doc/manual/pcb_import_stack_flow_5.png similarity index 100% rename from src/lay/doc/manual/pcb_import_stack_flow_5.png rename to src/lay/lay/doc/manual/pcb_import_stack_flow_5.png diff --git a/src/lay/doc/manual/pcb_import_stack_flow_6.png b/src/lay/lay/doc/manual/pcb_import_stack_flow_6.png similarity index 100% rename from src/lay/doc/manual/pcb_import_stack_flow_6.png rename to src/lay/lay/doc/manual/pcb_import_stack_flow_6.png diff --git a/src/lay/doc/manual/pcb_import_stack_flow_7.png b/src/lay/lay/doc/manual/pcb_import_stack_flow_7.png similarity index 100% rename from src/lay/doc/manual/pcb_import_stack_flow_7.png rename to src/lay/lay/doc/manual/pcb_import_stack_flow_7.png diff --git a/src/lay/doc/manual/pcell_operations.xml b/src/lay/lay/doc/manual/pcell_operations.xml similarity index 100% rename from src/lay/doc/manual/pcell_operations.xml rename to src/lay/lay/doc/manual/pcell_operations.xml diff --git a/src/lay/doc/manual/pick_and_drop.xml b/src/lay/lay/doc/manual/pick_and_drop.xml similarity index 100% rename from src/lay/doc/manual/pick_and_drop.xml rename to src/lay/lay/doc/manual/pick_and_drop.xml diff --git a/src/lay/doc/manual/rename_cell.xml b/src/lay/lay/doc/manual/rename_cell.xml similarity index 100% rename from src/lay/doc/manual/rename_cell.xml rename to src/lay/lay/doc/manual/rename_cell.xml diff --git a/src/lay/doc/manual/resolve_arrays.xml b/src/lay/lay/doc/manual/resolve_arrays.xml similarity index 100% rename from src/lay/doc/manual/resolve_arrays.xml rename to src/lay/lay/doc/manual/resolve_arrays.xml diff --git a/src/lay/doc/manual/round_corners.png b/src/lay/lay/doc/manual/round_corners.png similarity index 100% rename from src/lay/doc/manual/round_corners.png rename to src/lay/lay/doc/manual/round_corners.png diff --git a/src/lay/doc/manual/round_corners.xml b/src/lay/lay/doc/manual/round_corners.xml similarity index 100% rename from src/lay/doc/manual/round_corners.xml rename to src/lay/lay/doc/manual/round_corners.xml diff --git a/src/lay/doc/manual/ruler_properties.xml b/src/lay/lay/doc/manual/ruler_properties.xml similarity index 100% rename from src/lay/doc/manual/ruler_properties.xml rename to src/lay/lay/doc/manual/ruler_properties.xml diff --git a/src/lay/doc/manual/save.xml b/src/lay/lay/doc/manual/save.xml similarity index 100% rename from src/lay/doc/manual/save.xml rename to src/lay/lay/doc/manual/save.xml diff --git a/src/lay/doc/manual/screenshots.xml b/src/lay/lay/doc/manual/screenshots.xml similarity index 100% rename from src/lay/doc/manual/screenshots.xml rename to src/lay/lay/doc/manual/screenshots.xml diff --git a/src/lay/doc/manual/search_replace.xml b/src/lay/lay/doc/manual/search_replace.xml similarity index 100% rename from src/lay/doc/manual/search_replace.xml rename to src/lay/lay/doc/manual/search_replace.xml diff --git a/src/lay/doc/manual/selecting.xml b/src/lay/lay/doc/manual/selecting.xml similarity index 100% rename from src/lay/doc/manual/selecting.xml rename to src/lay/lay/doc/manual/selecting.xml diff --git a/src/lay/doc/manual/session.xml b/src/lay/lay/doc/manual/session.xml similarity index 100% rename from src/lay/doc/manual/session.xml rename to src/lay/lay/doc/manual/session.xml diff --git a/src/lay/doc/manual/setup.xml b/src/lay/lay/doc/manual/setup.xml similarity index 100% rename from src/lay/doc/manual/setup.xml rename to src/lay/lay/doc/manual/setup.xml diff --git a/src/lay/doc/manual/shape_boolean.xml b/src/lay/lay/doc/manual/shape_boolean.xml similarity index 100% rename from src/lay/doc/manual/shape_boolean.xml rename to src/lay/lay/doc/manual/shape_boolean.xml diff --git a/src/lay/doc/manual/shape_size.xml b/src/lay/lay/doc/manual/shape_size.xml similarity index 100% rename from src/lay/doc/manual/shape_size.xml rename to src/lay/lay/doc/manual/shape_size.xml diff --git a/src/lay/doc/manual/size_modes.png b/src/lay/lay/doc/manual/size_modes.png similarity index 100% rename from src/lay/doc/manual/size_modes.png rename to src/lay/lay/doc/manual/size_modes.png diff --git a/src/lay/doc/manual/technology_manager.xml b/src/lay/lay/doc/manual/technology_manager.xml similarity index 100% rename from src/lay/doc/manual/technology_manager.xml rename to src/lay/lay/doc/manual/technology_manager.xml diff --git a/src/lay/doc/manual/tiling.xml b/src/lay/lay/doc/manual/tiling.xml similarity index 100% rename from src/lay/doc/manual/tiling.xml rename to src/lay/lay/doc/manual/tiling.xml diff --git a/src/lay/doc/manual/trans_sel.xml b/src/lay/lay/doc/manual/trans_sel.xml similarity index 100% rename from src/lay/doc/manual/trans_sel.xml rename to src/lay/lay/doc/manual/trans_sel.xml diff --git a/src/lay/doc/manual/undo_redo.xml b/src/lay/lay/doc/manual/undo_redo.xml similarity index 100% rename from src/lay/doc/manual/undo_redo.xml rename to src/lay/lay/doc/manual/undo_redo.xml diff --git a/src/lay/doc/manual/view_options.xml b/src/lay/lay/doc/manual/view_options.xml similarity index 100% rename from src/lay/doc/manual/view_options.xml rename to src/lay/lay/doc/manual/view_options.xml diff --git a/src/lay/doc/manual/view_state.xml b/src/lay/lay/doc/manual/view_state.xml similarity index 100% rename from src/lay/doc/manual/view_state.xml rename to src/lay/lay/doc/manual/view_state.xml diff --git a/src/lay/doc/manual/xor.xml b/src/lay/lay/doc/manual/xor.xml similarity index 100% rename from src/lay/doc/manual/xor.xml rename to src/lay/lay/doc/manual/xor.xml diff --git a/src/lay/doc/manual/zoom.xml b/src/lay/lay/doc/manual/zoom.xml similarity index 100% rename from src/lay/doc/manual/zoom.xml rename to src/lay/lay/doc/manual/zoom.xml diff --git a/src/lay/doc/navigator_sep.png b/src/lay/lay/doc/navigator_sep.png similarity index 100% rename from src/lay/doc/navigator_sep.png rename to src/lay/lay/doc/navigator_sep.png diff --git a/src/lay/doc/programming/application_api.xml b/src/lay/lay/doc/programming/application_api.xml similarity index 100% rename from src/lay/doc/programming/application_api.xml rename to src/lay/lay/doc/programming/application_api.xml diff --git a/src/lay/doc/programming/box.png b/src/lay/lay/doc/programming/box.png similarity index 100% rename from src/lay/doc/programming/box.png rename to src/lay/lay/doc/programming/box.png diff --git a/src/lay/doc/programming/database_api.xml b/src/lay/lay/doc/programming/database_api.xml similarity index 100% rename from src/lay/doc/programming/database_api.xml rename to src/lay/lay/doc/programming/database_api.xml diff --git a/src/lay/doc/programming/edge_relations.png b/src/lay/lay/doc/programming/edge_relations.png similarity index 100% rename from src/lay/doc/programming/edge_relations.png rename to src/lay/lay/doc/programming/edge_relations.png diff --git a/src/lay/doc/programming/events.xml b/src/lay/lay/doc/programming/events.xml similarity index 100% rename from src/lay/doc/programming/events.xml rename to src/lay/lay/doc/programming/events.xml diff --git a/src/lay/doc/programming/geometry_api.xml b/src/lay/lay/doc/programming/geometry_api.xml similarity index 100% rename from src/lay/doc/programming/geometry_api.xml rename to src/lay/lay/doc/programming/geometry_api.xml diff --git a/src/lay/doc/programming/index.xml b/src/lay/lay/doc/programming/index.xml similarity index 100% rename from src/lay/doc/programming/index.xml rename to src/lay/lay/doc/programming/index.xml diff --git a/src/lay/doc/programming/introduction.xml b/src/lay/lay/doc/programming/introduction.xml similarity index 100% rename from src/lay/doc/programming/introduction.xml rename to src/lay/lay/doc/programming/introduction.xml diff --git a/src/lay/doc/programming/path.png b/src/lay/lay/doc/programming/path.png similarity index 100% rename from src/lay/doc/programming/path.png rename to src/lay/lay/doc/programming/path.png diff --git a/src/lay/doc/programming/polygon.png b/src/lay/lay/doc/programming/polygon.png similarity index 100% rename from src/lay/doc/programming/polygon.png rename to src/lay/lay/doc/programming/polygon.png diff --git a/src/lay/doc/programming/python.xml b/src/lay/lay/doc/programming/python.xml similarity index 100% rename from src/lay/doc/programming/python.xml rename to src/lay/lay/doc/programming/python.xml diff --git a/src/lay/doc/programming/qt_binding.xml b/src/lay/lay/doc/programming/qt_binding.xml similarity index 100% rename from src/lay/doc/programming/qt_binding.xml rename to src/lay/lay/doc/programming/qt_binding.xml diff --git a/src/lay/doc/programming/round_ended_path.png b/src/lay/lay/doc/programming/round_ended_path.png similarity index 100% rename from src/lay/doc/programming/round_ended_path.png rename to src/lay/lay/doc/programming/round_ended_path.png diff --git a/src/lay/doc/programming/ruby_binding.xml b/src/lay/lay/doc/programming/ruby_binding.xml similarity index 100% rename from src/lay/doc/programming/ruby_binding.xml rename to src/lay/lay/doc/programming/ruby_binding.xml diff --git a/src/lay/doc/programming/ruby_binding_basic.png b/src/lay/lay/doc/programming/ruby_binding_basic.png similarity index 100% rename from src/lay/doc/programming/ruby_binding_basic.png rename to src/lay/lay/doc/programming/ruby_binding_basic.png diff --git a/src/lay/doc/programming/ruby_binding_callback.png b/src/lay/lay/doc/programming/ruby_binding_callback.png similarity index 100% rename from src/lay/doc/programming/ruby_binding_callback.png rename to src/lay/lay/doc/programming/ruby_binding_callback.png diff --git a/src/lay/doc/programming/ruby_pcells.xml b/src/lay/lay/doc/programming/ruby_pcells.xml similarity index 100% rename from src/lay/doc/programming/ruby_pcells.xml rename to src/lay/lay/doc/programming/ruby_pcells.xml diff --git a/src/lay/doc/programming/simple_polygon.png b/src/lay/lay/doc/programming/simple_polygon.png similarity index 100% rename from src/lay/doc/programming/simple_polygon.png rename to src/lay/lay/doc/programming/simple_polygon.png diff --git a/src/lay/gsiDeclLayApplication.cc b/src/lay/lay/gsiDeclLayApplication.cc similarity index 100% rename from src/lay/gsiDeclLayApplication.cc rename to src/lay/lay/gsiDeclLayApplication.cc diff --git a/src/lay/gsiDeclLayHelpDialog.cc b/src/lay/lay/gsiDeclLayHelpDialog.cc similarity index 100% rename from src/lay/gsiDeclLayHelpDialog.cc rename to src/lay/lay/gsiDeclLayHelpDialog.cc diff --git a/src/lay/gsiDeclLayMainWindow.cc b/src/lay/lay/gsiDeclLayMainWindow.cc similarity index 100% rename from src/lay/gsiDeclLayMainWindow.cc rename to src/lay/lay/gsiDeclLayMainWindow.cc diff --git a/src/lay/images/add.png b/src/lay/lay/images/add.png similarity index 100% rename from src/lay/images/add.png rename to src/lay/lay/images/add.png diff --git a/src/lay/images/align_bottom.png b/src/lay/lay/images/align_bottom.png similarity index 100% rename from src/lay/images/align_bottom.png rename to src/lay/lay/images/align_bottom.png diff --git a/src/lay/images/align_hcenter.png b/src/lay/lay/images/align_hcenter.png similarity index 100% rename from src/lay/images/align_hcenter.png rename to src/lay/lay/images/align_hcenter.png diff --git a/src/lay/images/align_left.png b/src/lay/lay/images/align_left.png similarity index 100% rename from src/lay/images/align_left.png rename to src/lay/lay/images/align_left.png diff --git a/src/lay/images/align_none.png b/src/lay/lay/images/align_none.png similarity index 100% rename from src/lay/images/align_none.png rename to src/lay/lay/images/align_none.png diff --git a/src/lay/images/align_right.png b/src/lay/lay/images/align_right.png similarity index 100% rename from src/lay/images/align_right.png rename to src/lay/lay/images/align_right.png diff --git a/src/lay/images/align_top.png b/src/lay/lay/images/align_top.png similarity index 100% rename from src/lay/images/align_top.png rename to src/lay/lay/images/align_top.png diff --git a/src/lay/images/align_vcenter.png b/src/lay/lay/images/align_vcenter.png similarity index 100% rename from src/lay/images/align_vcenter.png rename to src/lay/lay/images/align_vcenter.png diff --git a/src/lay/images/back.png b/src/lay/lay/images/back.png similarity index 100% rename from src/lay/images/back.png rename to src/lay/lay/images/back.png diff --git a/src/lay/images/back_16.png b/src/lay/lay/images/back_16.png similarity index 100% rename from src/lay/images/back_16.png rename to src/lay/lay/images/back_16.png diff --git a/src/lay/images/blue_flag.png b/src/lay/lay/images/blue_flag.png similarity index 100% rename from src/lay/images/blue_flag.png rename to src/lay/lay/images/blue_flag.png diff --git a/src/lay/images/box.png b/src/lay/lay/images/box.png similarity index 100% rename from src/lay/images/box.png rename to src/lay/lay/images/box.png diff --git a/src/lay/images/breakpoint.png b/src/lay/lay/images/breakpoint.png similarity index 100% rename from src/lay/images/breakpoint.png rename to src/lay/lay/images/breakpoint.png diff --git a/src/lay/images/breakpointmark.png b/src/lay/lay/images/breakpointmark.png similarity index 100% rename from src/lay/images/breakpointmark.png rename to src/lay/lay/images/breakpointmark.png diff --git a/src/lay/images/breakpointmarkdisabled.png b/src/lay/lay/images/breakpointmarkdisabled.png similarity index 100% rename from src/lay/images/breakpointmarkdisabled.png rename to src/lay/lay/images/breakpointmarkdisabled.png diff --git a/src/lay/images/bright.png b/src/lay/lay/images/bright.png similarity index 100% rename from src/lay/images/bright.png rename to src/lay/lay/images/bright.png diff --git a/src/lay/images/bug.png b/src/lay/lay/images/bug.png similarity index 100% rename from src/lay/images/bug.png rename to src/lay/lay/images/bug.png diff --git a/src/lay/images/bulb.png b/src/lay/lay/images/bulb.png similarity index 100% rename from src/lay/images/bulb.png rename to src/lay/lay/images/bulb.png diff --git a/src/lay/images/cb.png b/src/lay/lay/images/cb.png similarity index 100% rename from src/lay/images/cb.png rename to src/lay/lay/images/cb.png diff --git a/src/lay/images/cc.png b/src/lay/lay/images/cc.png similarity index 100% rename from src/lay/images/cc.png rename to src/lay/lay/images/cc.png diff --git a/src/lay/images/checked.png b/src/lay/lay/images/checked.png similarity index 100% rename from src/lay/images/checked.png rename to src/lay/lay/images/checked.png diff --git a/src/lay/images/clear.png b/src/lay/lay/images/clear.png similarity index 100% rename from src/lay/images/clear.png rename to src/lay/lay/images/clear.png diff --git a/src/lay/images/clear_edit.png b/src/lay/lay/images/clear_edit.png similarity index 100% rename from src/lay/images/clear_edit.png rename to src/lay/lay/images/clear_edit.png diff --git a/src/lay/images/clearbreakpoints.png b/src/lay/lay/images/clearbreakpoints.png similarity index 100% rename from src/lay/images/clearbreakpoints.png rename to src/lay/lay/images/clearbreakpoints.png diff --git a/src/lay/images/close.png b/src/lay/lay/images/close.png similarity index 100% rename from src/lay/images/close.png rename to src/lay/lay/images/close.png diff --git a/src/lay/images/cm_add.png b/src/lay/lay/images/cm_add.png similarity index 100% rename from src/lay/images/cm_add.png rename to src/lay/lay/images/cm_add.png diff --git a/src/lay/images/cm_diff.png b/src/lay/lay/images/cm_diff.png similarity index 100% rename from src/lay/images/cm_diff.png rename to src/lay/lay/images/cm_diff.png diff --git a/src/lay/images/cm_erase.png b/src/lay/lay/images/cm_erase.png similarity index 100% rename from src/lay/images/cm_erase.png rename to src/lay/lay/images/cm_erase.png diff --git a/src/lay/images/cm_mask.png b/src/lay/lay/images/cm_mask.png similarity index 100% rename from src/lay/images/cm_mask.png rename to src/lay/lay/images/cm_mask.png diff --git a/src/lay/images/cm_merge.png b/src/lay/lay/images/cm_merge.png similarity index 100% rename from src/lay/images/cm_merge.png rename to src/lay/lay/images/cm_merge.png diff --git a/src/lay/images/ct.png b/src/lay/lay/images/ct.png similarity index 100% rename from src/lay/images/ct.png rename to src/lay/lay/images/ct.png diff --git a/src/lay/images/dark.png b/src/lay/lay/images/dark.png similarity index 100% rename from src/lay/images/dark.png rename to src/lay/lay/images/dark.png diff --git a/src/lay/images/debug.png b/src/lay/lay/images/debug.png similarity index 100% rename from src/lay/images/debug.png rename to src/lay/lay/images/debug.png diff --git a/src/lay/images/defaultmacroicon.png b/src/lay/lay/images/defaultmacroicon.png similarity index 100% rename from src/lay/images/defaultmacroicon.png rename to src/lay/lay/images/defaultmacroicon.png diff --git a/src/lay/images/del.png b/src/lay/lay/images/del.png similarity index 100% rename from src/lay/images/del.png rename to src/lay/lay/images/del.png diff --git a/src/lay/images/down.png b/src/lay/lay/images/down.png similarity index 100% rename from src/lay/images/down.png rename to src/lay/lay/images/down.png diff --git a/src/lay/images/downdown.png b/src/lay/lay/images/downdown.png similarity index 100% rename from src/lay/images/downdown.png rename to src/lay/lay/images/downdown.png diff --git a/src/lay/images/edit.png b/src/lay/lay/images/edit.png similarity index 100% rename from src/lay/images/edit.png rename to src/lay/lay/images/edit.png diff --git a/src/lay/images/empty_12.png b/src/lay/lay/images/empty_12.png similarity index 100% rename from src/lay/images/empty_12.png rename to src/lay/lay/images/empty_12.png diff --git a/src/lay/images/empty_16.png b/src/lay/lay/images/empty_16.png similarity index 100% rename from src/lay/images/empty_16.png rename to src/lay/lay/images/empty_16.png diff --git a/src/lay/images/error_16.png b/src/lay/lay/images/error_16.png similarity index 100% rename from src/lay/images/error_16.png rename to src/lay/lay/images/error_16.png diff --git a/src/lay/images/execmark.png b/src/lay/lay/images/execmark.png similarity index 100% rename from src/lay/images/execmark.png rename to src/lay/lay/images/execmark.png diff --git a/src/lay/images/file_12.png b/src/lay/lay/images/file_12.png similarity index 100% rename from src/lay/images/file_12.png rename to src/lay/lay/images/file_12.png diff --git a/src/lay/images/find.png b/src/lay/lay/images/find.png similarity index 100% rename from src/lay/images/find.png rename to src/lay/lay/images/find.png diff --git a/src/lay/images/fliph.png b/src/lay/lay/images/fliph.png similarity index 100% rename from src/lay/images/fliph.png rename to src/lay/lay/images/fliph.png diff --git a/src/lay/images/flipv.png b/src/lay/lay/images/flipv.png similarity index 100% rename from src/lay/images/flipv.png rename to src/lay/lay/images/flipv.png diff --git a/src/lay/images/folder.png b/src/lay/lay/images/folder.png similarity index 100% rename from src/lay/images/folder.png rename to src/lay/lay/images/folder.png diff --git a/src/lay/images/folder_12.png b/src/lay/lay/images/folder_12.png similarity index 100% rename from src/lay/images/folder_12.png rename to src/lay/lay/images/folder_12.png diff --git a/src/lay/images/forward.png b/src/lay/lay/images/forward.png similarity index 100% rename from src/lay/images/forward.png rename to src/lay/lay/images/forward.png diff --git a/src/lay/images/forward_16.png b/src/lay/lay/images/forward_16.png similarity index 100% rename from src/lay/images/forward_16.png rename to src/lay/lay/images/forward_16.png diff --git a/src/lay/images/generalmacroicon.png b/src/lay/lay/images/generalmacroicon.png similarity index 100% rename from src/lay/images/generalmacroicon.png rename to src/lay/lay/images/generalmacroicon.png diff --git a/src/lay/images/generalmacroiconactive.png b/src/lay/lay/images/generalmacroiconactive.png similarity index 100% rename from src/lay/images/generalmacroiconactive.png rename to src/lay/lay/images/generalmacroiconactive.png diff --git a/src/lay/images/green_flag.png b/src/lay/lay/images/green_flag.png similarity index 100% rename from src/lay/images/green_flag.png rename to src/lay/lay/images/green_flag.png diff --git a/src/lay/images/gtf_basic.png b/src/lay/lay/images/gtf_basic.png similarity index 100% rename from src/lay/images/gtf_basic.png rename to src/lay/lay/images/gtf_basic.png diff --git a/src/lay/images/gtf_lb.png b/src/lay/lay/images/gtf_lb.png similarity index 100% rename from src/lay/images/gtf_lb.png rename to src/lay/lay/images/gtf_lb.png diff --git a/src/lay/images/gtf_mb.png b/src/lay/lay/images/gtf_mb.png similarity index 100% rename from src/lay/images/gtf_mb.png rename to src/lay/lay/images/gtf_mb.png diff --git a/src/lay/images/gtf_rb.png b/src/lay/lay/images/gtf_rb.png similarity index 100% rename from src/lay/images/gtf_rb.png rename to src/lay/lay/images/gtf_rb.png diff --git a/src/lay/images/help.png b/src/lay/lay/images/help.png similarity index 100% rename from src/lay/images/help.png rename to src/lay/lay/images/help.png diff --git a/src/lay/images/home.png b/src/lay/lay/images/home.png similarity index 100% rename from src/lay/images/home.png rename to src/lay/lay/images/home.png diff --git a/src/lay/images/import.png b/src/lay/lay/images/import.png similarity index 100% rename from src/lay/images/import.png rename to src/lay/lay/images/import.png diff --git a/src/lay/images/important.png b/src/lay/lay/images/important.png similarity index 100% rename from src/lay/images/important.png rename to src/lay/lay/images/important.png diff --git a/src/lay/images/info_16.png b/src/lay/lay/images/info_16.png similarity index 100% rename from src/lay/images/info_16.png rename to src/lay/lay/images/info_16.png diff --git a/src/lay/images/instance.png b/src/lay/lay/images/instance.png similarity index 100% rename from src/lay/images/instance.png rename to src/lay/lay/images/instance.png diff --git a/src/lay/images/invert.png b/src/lay/lay/images/invert.png similarity index 100% rename from src/lay/images/invert.png rename to src/lay/lay/images/invert.png diff --git a/src/lay/images/lb.png b/src/lay/lay/images/lb.png similarity index 100% rename from src/lay/images/lb.png rename to src/lay/lay/images/lb.png diff --git a/src/lay/images/lc.png b/src/lay/lay/images/lc.png similarity index 100% rename from src/lay/images/lc.png rename to src/lay/lay/images/lc.png diff --git a/src/lay/images/left.png b/src/lay/lay/images/left.png similarity index 100% rename from src/lay/images/left.png rename to src/lay/lay/images/left.png diff --git a/src/lay/images/logo.png b/src/lay/lay/images/logo.png similarity index 100% rename from src/lay/images/logo.png rename to src/lay/lay/images/logo.png diff --git a/src/lay/images/lt.png b/src/lay/lay/images/lt.png similarity index 100% rename from src/lay/images/lt.png rename to src/lay/lay/images/lt.png diff --git a/src/lay/images/m0.png b/src/lay/lay/images/m0.png similarity index 100% rename from src/lay/images/m0.png rename to src/lay/lay/images/m0.png diff --git a/src/lay/images/m135.png b/src/lay/lay/images/m135.png similarity index 100% rename from src/lay/images/m135.png rename to src/lay/lay/images/m135.png diff --git a/src/lay/images/m45.png b/src/lay/lay/images/m45.png similarity index 100% rename from src/lay/images/m45.png rename to src/lay/lay/images/m45.png diff --git a/src/lay/images/m90.png b/src/lay/lay/images/m90.png similarity index 100% rename from src/lay/images/m90.png rename to src/lay/lay/images/m90.png diff --git a/src/lay/images/marked_16.png b/src/lay/lay/images/marked_16.png similarity index 100% rename from src/lay/images/marked_16.png rename to src/lay/lay/images/marked_16.png diff --git a/src/lay/images/marked_24.png b/src/lay/lay/images/marked_24.png similarity index 100% rename from src/lay/images/marked_24.png rename to src/lay/lay/images/marked_24.png diff --git a/src/lay/images/marked_64.png b/src/lay/lay/images/marked_64.png similarity index 100% rename from src/lay/images/marked_64.png rename to src/lay/lay/images/marked_64.png diff --git a/src/lay/images/move.png b/src/lay/lay/images/move.png similarity index 100% rename from src/lay/images/move.png rename to src/lay/lay/images/move.png diff --git a/src/lay/images/move_simple.png b/src/lay/lay/images/move_simple.png similarity index 100% rename from src/lay/images/move_simple.png rename to src/lay/lay/images/move_simple.png diff --git a/src/lay/images/neutral.png b/src/lay/lay/images/neutral.png similarity index 100% rename from src/lay/images/neutral.png rename to src/lay/lay/images/neutral.png diff --git a/src/lay/images/new_folder.png b/src/lay/lay/images/new_folder.png similarity index 100% rename from src/lay/images/new_folder.png rename to src/lay/lay/images/new_folder.png diff --git a/src/lay/images/next_topic.png b/src/lay/lay/images/next_topic.png similarity index 100% rename from src/lay/images/next_topic.png rename to src/lay/lay/images/next_topic.png diff --git a/src/lay/images/nextstep.png b/src/lay/lay/images/nextstep.png similarity index 100% rename from src/lay/images/nextstep.png rename to src/lay/lay/images/nextstep.png diff --git a/src/lay/images/no_flag.png b/src/lay/lay/images/no_flag.png similarity index 100% rename from src/lay/images/no_flag.png rename to src/lay/lay/images/no_flag.png diff --git a/src/lay/images/nophoto.png b/src/lay/lay/images/nophoto.png similarity index 100% rename from src/lay/images/nophoto.png rename to src/lay/lay/images/nophoto.png diff --git a/src/lay/images/options_edit.png b/src/lay/lay/images/options_edit.png similarity index 100% rename from src/lay/images/options_edit.png rename to src/lay/lay/images/options_edit.png diff --git a/src/lay/images/partial.png b/src/lay/lay/images/partial.png similarity index 100% rename from src/lay/images/partial.png rename to src/lay/lay/images/partial.png diff --git a/src/lay/images/path.png b/src/lay/lay/images/path.png similarity index 100% rename from src/lay/images/path.png rename to src/lay/lay/images/path.png diff --git a/src/lay/images/pause.png b/src/lay/lay/images/pause.png similarity index 100% rename from src/lay/images/pause.png rename to src/lay/lay/images/pause.png diff --git a/src/lay/images/photo.png b/src/lay/lay/images/photo.png similarity index 100% rename from src/lay/images/photo.png rename to src/lay/lay/images/photo.png diff --git a/src/lay/images/polygon.png b/src/lay/lay/images/polygon.png similarity index 100% rename from src/lay/images/polygon.png rename to src/lay/lay/images/polygon.png diff --git a/src/lay/images/prev_topic.png b/src/lay/lay/images/prev_topic.png similarity index 100% rename from src/lay/images/prev_topic.png rename to src/lay/lay/images/prev_topic.png diff --git a/src/lay/images/properties.png b/src/lay/lay/images/properties.png similarity index 100% rename from src/lay/images/properties.png rename to src/lay/lay/images/properties.png diff --git a/src/lay/images/pythonmacroicon.png b/src/lay/lay/images/pythonmacroicon.png similarity index 100% rename from src/lay/images/pythonmacroicon.png rename to src/lay/lay/images/pythonmacroicon.png diff --git a/src/lay/images/pythonmacroiconactive.png b/src/lay/lay/images/pythonmacroiconactive.png similarity index 100% rename from src/lay/images/pythonmacroiconactive.png rename to src/lay/lay/images/pythonmacroiconactive.png diff --git a/src/lay/images/r0.png b/src/lay/lay/images/r0.png similarity index 100% rename from src/lay/images/r0.png rename to src/lay/lay/images/r0.png diff --git a/src/lay/images/r180.png b/src/lay/lay/images/r180.png similarity index 100% rename from src/lay/images/r180.png rename to src/lay/lay/images/r180.png diff --git a/src/lay/images/r270.png b/src/lay/lay/images/r270.png similarity index 100% rename from src/lay/images/r270.png rename to src/lay/lay/images/r270.png diff --git a/src/lay/images/r90.png b/src/lay/lay/images/r90.png similarity index 100% rename from src/lay/images/r90.png rename to src/lay/lay/images/r90.png diff --git a/src/lay/images/rb.png b/src/lay/lay/images/rb.png similarity index 100% rename from src/lay/images/rb.png rename to src/lay/lay/images/rb.png diff --git a/src/lay/images/rc.png b/src/lay/lay/images/rc.png similarity index 100% rename from src/lay/images/rc.png rename to src/lay/lay/images/rc.png diff --git a/src/lay/images/red_flag.png b/src/lay/lay/images/red_flag.png similarity index 100% rename from src/lay/images/red_flag.png rename to src/lay/lay/images/red_flag.png diff --git a/src/lay/images/rename.png b/src/lay/lay/images/rename.png similarity index 100% rename from src/lay/images/rename.png rename to src/lay/lay/images/rename.png diff --git a/src/lay/images/replace.png b/src/lay/lay/images/replace.png similarity index 100% rename from src/lay/images/replace.png rename to src/lay/lay/images/replace.png diff --git a/src/lay/images/replace_all.png b/src/lay/lay/images/replace_all.png similarity index 100% rename from src/lay/images/replace_all.png rename to src/lay/lay/images/replace_all.png diff --git a/src/lay/images/right.png b/src/lay/lay/images/right.png similarity index 100% rename from src/lay/images/right.png rename to src/lay/lay/images/right.png diff --git a/src/lay/images/rotate.png b/src/lay/lay/images/rotate.png similarity index 100% rename from src/lay/images/rotate.png rename to src/lay/lay/images/rotate.png diff --git a/src/lay/images/rt.png b/src/lay/lay/images/rt.png similarity index 100% rename from src/lay/images/rt.png rename to src/lay/lay/images/rt.png diff --git a/src/lay/images/rubymacroicon.png b/src/lay/lay/images/rubymacroicon.png similarity index 100% rename from src/lay/images/rubymacroicon.png rename to src/lay/lay/images/rubymacroicon.png diff --git a/src/lay/images/rubymacroiconactive.png b/src/lay/lay/images/rubymacroiconactive.png similarity index 100% rename from src/lay/images/rubymacroiconactive.png rename to src/lay/lay/images/rubymacroiconactive.png diff --git a/src/lay/images/ruler.png b/src/lay/lay/images/ruler.png similarity index 100% rename from src/lay/images/ruler.png rename to src/lay/lay/images/ruler.png diff --git a/src/lay/images/run.png b/src/lay/lay/images/run.png similarity index 100% rename from src/lay/images/run.png rename to src/lay/lay/images/run.png diff --git a/src/lay/images/runthis.png b/src/lay/lay/images/runthis.png similarity index 100% rename from src/lay/images/runthis.png rename to src/lay/lay/images/runthis.png diff --git a/src/lay/images/salt.png b/src/lay/lay/images/salt.png similarity index 100% rename from src/lay/images/salt.png rename to src/lay/lay/images/salt.png diff --git a/src/lay/images/salt_icon.png b/src/lay/lay/images/salt_icon.png similarity index 100% rename from src/lay/images/salt_icon.png rename to src/lay/lay/images/salt_icon.png diff --git a/src/lay/images/save.png b/src/lay/lay/images/save.png similarity index 100% rename from src/lay/images/save.png rename to src/lay/lay/images/save.png diff --git a/src/lay/images/save_all.png b/src/lay/lay/images/save_all.png similarity index 100% rename from src/lay/images/save_all.png rename to src/lay/lay/images/save_all.png diff --git a/src/lay/images/select.png b/src/lay/lay/images/select.png similarity index 100% rename from src/lay/images/select.png rename to src/lay/lay/images/select.png diff --git a/src/lay/images/setup.png b/src/lay/lay/images/setup.png similarity index 100% rename from src/lay/images/setup.png rename to src/lay/lay/images/setup.png diff --git a/src/lay/images/singlestep.png b/src/lay/lay/images/singlestep.png similarity index 100% rename from src/lay/images/singlestep.png rename to src/lay/lay/images/singlestep.png diff --git a/src/lay/images/st_plus_node.png b/src/lay/lay/images/st_plus_node.png similarity index 100% rename from src/lay/images/st_plus_node.png rename to src/lay/lay/images/st_plus_node.png diff --git a/src/lay/images/stop.png b/src/lay/lay/images/stop.png similarity index 100% rename from src/lay/images/stop.png rename to src/lay/lay/images/stop.png diff --git a/src/lay/images/techs.png b/src/lay/lay/images/techs.png similarity index 100% rename from src/lay/images/techs.png rename to src/lay/lay/images/techs.png diff --git a/src/lay/images/text.png b/src/lay/lay/images/text.png similarity index 100% rename from src/lay/images/text.png rename to src/lay/lay/images/text.png diff --git a/src/lay/images/textdocumenticon.png b/src/lay/lay/images/textdocumenticon.png similarity index 100% rename from src/lay/images/textdocumenticon.png rename to src/lay/lay/images/textdocumenticon.png diff --git a/src/lay/images/unchecked.png b/src/lay/lay/images/unchecked.png similarity index 100% rename from src/lay/images/unchecked.png rename to src/lay/lay/images/unchecked.png diff --git a/src/lay/images/up.png b/src/lay/lay/images/up.png similarity index 100% rename from src/lay/images/up.png rename to src/lay/lay/images/up.png diff --git a/src/lay/images/upup.png b/src/lay/lay/images/upup.png similarity index 100% rename from src/lay/images/upup.png rename to src/lay/lay/images/upup.png diff --git a/src/lay/images/waived.png b/src/lay/lay/images/waived.png similarity index 100% rename from src/lay/images/waived.png rename to src/lay/lay/images/waived.png diff --git a/src/lay/images/warn.png b/src/lay/lay/images/warn.png similarity index 100% rename from src/lay/images/warn.png rename to src/lay/lay/images/warn.png diff --git a/src/lay/images/warn_16.png b/src/lay/lay/images/warn_16.png similarity index 100% rename from src/lay/images/warn_16.png rename to src/lay/lay/images/warn_16.png diff --git a/src/lay/images/yellow_flag.png b/src/lay/lay/images/yellow_flag.png similarity index 100% rename from src/lay/images/yellow_flag.png rename to src/lay/lay/images/yellow_flag.png diff --git a/src/lay/lay/lay.pro b/src/lay/lay/lay.pro new file mode 100644 index 000000000..a3ae94e39 --- /dev/null +++ b/src/lay/lay/lay.pro @@ -0,0 +1,211 @@ + +DESTDIR = $$OUT_PWD/../.. +TARGET = klayout_lay + +include($$PWD/../../lib.pri) + +DEFINES += MAKE_LAY_LIBRARY + +HEADERS = \ + layApplication.h \ + layClipDialog.h \ + layCrashMessage.h \ + layFillDialog.h \ + layGenericSyntaxHighlighter.h \ + layGSIHelpProvider.h \ + layHelpDialog.h \ + layHelpProvider.h \ + layHelpSource.h \ + layLayoutStatisticsForm.h \ + layLogViewerDialog.h \ + layMacroEditorDialog.h \ + layMacroEditorPage.h \ + layMacroEditorSetupDialog.h \ + layMacroEditorTree.h \ + layMacroPropertiesDialog.h \ + layMacroVariableView.h \ + layMainConfigPages.h \ + layMainWindow.h \ + layNavigator.h \ + layProgress.h \ + layProgressWidget.h \ + layResourceHelpProvider.h \ + layRuntimeErrorForm.h \ + laySearchReplaceConfigPage.h \ + laySearchReplaceDialog.h \ + laySearchReplacePropertiesWidgets.h \ + laySelectCellViewForm.h \ + laySession.h \ + laySettingsForm.h \ + layTechSetupDialog.h \ + layTextProgress.h \ + layVersion.h \ + layCommon.h \ + layConfig.h \ + layMacroController.h \ + layTechnologyController.h \ + laySalt.h \ + laySaltGrain.h \ + laySaltGrains.h \ + laySaltManagerDialog.h \ + laySaltGrainDetailsTextWidget.h \ + laySaltGrainPropertiesDialog.h \ + laySaltDownloadManager.h \ + laySaltModel.h \ + laySaltController.h \ + laySignalHandler.h \ + layLibraryController.h \ + layFontController.h \ + layNativePlugin.h + +FORMS = \ + ClipDialog.ui \ + CrashMessage.ui \ + Console.ui \ + DeleteModeDialog.ui \ + FillDialog.ui \ + HelpAboutDialog.ui \ + KeyBindingsConfigPage.ui \ + LayoutStatistics.ui \ + LogViewerDialog.ui \ + MacroEditorDialog.ui \ + MacroEditorSetupDialog.ui \ + MacroPropertiesDialog.ui \ + MacroTemplateSelectionDialog.ui \ + MainConfigPage.ui \ + MainConfigPage2.ui \ + MainConfigPage3.ui \ + MainConfigPage4.ui \ + MainConfigPage5.ui \ + MainConfigPage6.ui \ + ReplacePropertiesBox.ui \ + ReplacePropertiesInstance.ui \ + ReplacePropertiesPath.ui \ + ReplacePropertiesShape.ui \ + ReplacePropertiesText.ui \ + RuntimeErrorForm.ui \ + SearchPropertiesBox.ui \ + SearchPropertiesInstance.ui \ + SearchPropertiesPath.ui \ + SearchPropertiesShape.ui \ + SearchPropertiesText.ui \ + SearchReplaceConfigPage.ui \ + SearchReplaceDialog.ui \ + SelectCellViewForm.ui \ + SettingsForm.ui \ + TechBaseEditorPage.ui \ + TechComponentSetupDialog.ui \ + TechLayerMappingEditorPage.ui \ + TechMacrosPage.ui \ + TechSetupDialog.ui \ + XORToolDialog.ui \ + TechLoadOptionsEditorPage.ui \ + TechSaveOptionsEditorPage.ui \ + MainConfigPage7.ui \ + SaltManagerDialog.ui \ + SaltGrainPropertiesDialog.ui \ + SaltGrainTemplateSelectionDialog.ui \ + SaltManagerInstallConfirmationDialog.ui + +SOURCES = \ + gsiDeclLayApplication.cc \ + gsiDeclLayHelpDialog.cc \ + gsiDeclLayMainWindow.cc \ + layApplication.cc \ + layClipDialog.cc \ + layCrashMessage.cc \ + layFillDialog.cc \ + layGenericSyntaxHighlighter.cc \ + layGSIHelpProvider.cc \ + layHelpDialog.cc \ + layHelpProvider.cc \ + layHelpSource.cc \ + layLayoutStatisticsForm.cc \ + layLogViewerDialog.cc \ + layMacroEditorDialog.cc \ + layMacroEditorPage.cc \ + layMacroEditorSetupDialog.cc \ + layMacroEditorTree.cc \ + layMacroPropertiesDialog.cc \ + layMacroVariableView.cc \ + layMainConfigPages.cc \ + layMainWindow.cc \ + layNavigator.cc \ + layProgress.cc \ + layProgressWidget.cc \ + layResourceHelpProvider.cc \ + layRuntimeErrorForm.cc \ + laySearchReplaceConfigPage.cc \ + laySearchReplaceDialog.cc \ + laySearchReplacePlugin.cc \ + laySearchReplacePropertiesWidgets.cc \ + laySelectCellViewForm.cc \ + laySession.cc \ + laySettingsForm.cc \ + layTechSetupDialog.cc \ + layTextProgress.cc \ + layVersion.cc \ + layMacroController.cc \ + layTechnologyController.cc \ + laySalt.cc \ + laySaltGrain.cc \ + laySaltGrains.cc \ + laySaltManagerDialog.cc \ + laySaltGrainDetailsTextWidget.cc \ + laySaltGrainPropertiesDialog.cc \ + laySaltDownloadManager.cc \ + laySaltModel.cc \ + laySaltController.cc \ + laySignalHandler.cc \ + layLibraryController.cc \ + layFontController.cc \ + layNativePlugin.cc + +RESOURCES = layBuildInMacros.qrc \ + layHelpResources.qrc \ + layLayoutStatistics.qrc \ + layMacroTemplates.qrc \ + layResources.qrc \ + laySaltTemplates.qrc + +INCLUDEPATH += $$TL_INC $$GSI_INC $$DB_INC $$RDB_INC $$LAYBASIC_INC $$ANT_INC $$IMG_INC $$EDT_INC $$LYM_INC +DEPENDPATH += $$TL_INC $$GSI_INC $$DB_INC $$RDB_INC $$LAYBASIC_INC $$ANT_INC $$IMG_INC $$EDT_INC $$LYM_INC +LIBS += -L$$DESTDIR -lklayout_tl -lklayout_gsi -lklayout_db -lklayout_rdb -lklayout_lym -lklayout_laybasic -lklayout_ant -lklayout_img -lklayout_edt + +win32 { + # for stack trace support: + # lpsapi for GetModuleFileName and others + # dbghelp for SymFromAddr and other + LIBS += -lpsapi -ldbghelp +} + +# Note: this accounts for UI-generated headers placed into the output folders in +# shadow builds: +INCLUDEPATH += $$DESTDIR/laybasic +DEPENDPATH += $$DESTDIR/laybasic + +INCLUDEPATH += $$GSIQT_INC +DEPENDPATH += $$GSIQT_INC + +equals(HAVE_QTBINDINGS, "1") { + LIBS += -lklayout_gsiqt +} + +INCLUDEPATH += $$RBA_INC +DEPENDPATH += $$RBA_INC + +equals(HAVE_RUBY, "1") { + LIBS += -lklayout_rba +} else { + LIBS += -lklayout_rbastub +} + +INCLUDEPATH += $$PYA_INC +DEPENDPATH += $$PYA_INC + +equals(HAVE_PYTHON, "1") { + LIBS += -lklayout_pya +} else { + LIBS += -lklayout_pyastub +} + diff --git a/src/lay/layApplication.cc b/src/lay/lay/layApplication.cc similarity index 100% rename from src/lay/layApplication.cc rename to src/lay/lay/layApplication.cc diff --git a/src/lay/layApplication.h b/src/lay/lay/layApplication.h similarity index 100% rename from src/lay/layApplication.h rename to src/lay/lay/layApplication.h diff --git a/src/lay/layBuildInMacros.qrc b/src/lay/lay/layBuildInMacros.qrc similarity index 100% rename from src/lay/layBuildInMacros.qrc rename to src/lay/lay/layBuildInMacros.qrc diff --git a/src/lay/layClipDialog.cc b/src/lay/lay/layClipDialog.cc similarity index 100% rename from src/lay/layClipDialog.cc rename to src/lay/lay/layClipDialog.cc diff --git a/src/lay/layClipDialog.h b/src/lay/lay/layClipDialog.h similarity index 100% rename from src/lay/layClipDialog.h rename to src/lay/lay/layClipDialog.h diff --git a/src/lay/layCommon.h b/src/lay/lay/layCommon.h similarity index 100% rename from src/lay/layCommon.h rename to src/lay/lay/layCommon.h diff --git a/src/lay/layConfig.h b/src/lay/lay/layConfig.h similarity index 100% rename from src/lay/layConfig.h rename to src/lay/lay/layConfig.h diff --git a/src/lay/layCrashMessage.cc b/src/lay/lay/layCrashMessage.cc similarity index 100% rename from src/lay/layCrashMessage.cc rename to src/lay/lay/layCrashMessage.cc diff --git a/src/lay/layCrashMessage.h b/src/lay/lay/layCrashMessage.h similarity index 100% rename from src/lay/layCrashMessage.h rename to src/lay/lay/layCrashMessage.h diff --git a/src/lay/layFillDialog.cc b/src/lay/lay/layFillDialog.cc similarity index 100% rename from src/lay/layFillDialog.cc rename to src/lay/lay/layFillDialog.cc diff --git a/src/lay/layFillDialog.h b/src/lay/lay/layFillDialog.h similarity index 100% rename from src/lay/layFillDialog.h rename to src/lay/lay/layFillDialog.h diff --git a/src/lay/layFontController.cc b/src/lay/lay/layFontController.cc similarity index 100% rename from src/lay/layFontController.cc rename to src/lay/lay/layFontController.cc diff --git a/src/lay/layFontController.h b/src/lay/lay/layFontController.h similarity index 100% rename from src/lay/layFontController.h rename to src/lay/lay/layFontController.h diff --git a/src/lay/layGSIHelpProvider.cc b/src/lay/lay/layGSIHelpProvider.cc similarity index 100% rename from src/lay/layGSIHelpProvider.cc rename to src/lay/lay/layGSIHelpProvider.cc diff --git a/src/lay/layGSIHelpProvider.h b/src/lay/lay/layGSIHelpProvider.h similarity index 100% rename from src/lay/layGSIHelpProvider.h rename to src/lay/lay/layGSIHelpProvider.h diff --git a/src/lay/layGenericSyntaxHighlighter.cc b/src/lay/lay/layGenericSyntaxHighlighter.cc similarity index 100% rename from src/lay/layGenericSyntaxHighlighter.cc rename to src/lay/lay/layGenericSyntaxHighlighter.cc diff --git a/src/lay/layGenericSyntaxHighlighter.h b/src/lay/lay/layGenericSyntaxHighlighter.h similarity index 100% rename from src/lay/layGenericSyntaxHighlighter.h rename to src/lay/lay/layGenericSyntaxHighlighter.h diff --git a/src/lay/layHelpDialog.cc b/src/lay/lay/layHelpDialog.cc similarity index 100% rename from src/lay/layHelpDialog.cc rename to src/lay/lay/layHelpDialog.cc diff --git a/src/lay/layHelpDialog.h b/src/lay/lay/layHelpDialog.h similarity index 100% rename from src/lay/layHelpDialog.h rename to src/lay/lay/layHelpDialog.h diff --git a/src/lay/layHelpProvider.cc b/src/lay/lay/layHelpProvider.cc similarity index 100% rename from src/lay/layHelpProvider.cc rename to src/lay/lay/layHelpProvider.cc diff --git a/src/lay/layHelpProvider.h b/src/lay/lay/layHelpProvider.h similarity index 100% rename from src/lay/layHelpProvider.h rename to src/lay/lay/layHelpProvider.h diff --git a/src/lay/layHelpResources.qrc b/src/lay/lay/layHelpResources.qrc similarity index 100% rename from src/lay/layHelpResources.qrc rename to src/lay/lay/layHelpResources.qrc diff --git a/src/lay/layHelpSource.cc b/src/lay/lay/layHelpSource.cc similarity index 100% rename from src/lay/layHelpSource.cc rename to src/lay/lay/layHelpSource.cc diff --git a/src/lay/layHelpSource.h b/src/lay/lay/layHelpSource.h similarity index 100% rename from src/lay/layHelpSource.h rename to src/lay/lay/layHelpSource.h diff --git a/src/lay/layLayoutStatistics.qrc b/src/lay/lay/layLayoutStatistics.qrc similarity index 100% rename from src/lay/layLayoutStatistics.qrc rename to src/lay/lay/layLayoutStatistics.qrc diff --git a/src/lay/layLayoutStatisticsForm.cc b/src/lay/lay/layLayoutStatisticsForm.cc similarity index 100% rename from src/lay/layLayoutStatisticsForm.cc rename to src/lay/lay/layLayoutStatisticsForm.cc diff --git a/src/lay/layLayoutStatisticsForm.h b/src/lay/lay/layLayoutStatisticsForm.h similarity index 100% rename from src/lay/layLayoutStatisticsForm.h rename to src/lay/lay/layLayoutStatisticsForm.h diff --git a/src/lay/layLibraryController.cc b/src/lay/lay/layLibraryController.cc similarity index 100% rename from src/lay/layLibraryController.cc rename to src/lay/lay/layLibraryController.cc diff --git a/src/lay/layLibraryController.h b/src/lay/lay/layLibraryController.h similarity index 100% rename from src/lay/layLibraryController.h rename to src/lay/lay/layLibraryController.h diff --git a/src/lay/layLogViewerDialog.cc b/src/lay/lay/layLogViewerDialog.cc similarity index 100% rename from src/lay/layLogViewerDialog.cc rename to src/lay/lay/layLogViewerDialog.cc diff --git a/src/lay/layLogViewerDialog.h b/src/lay/lay/layLogViewerDialog.h similarity index 100% rename from src/lay/layLogViewerDialog.h rename to src/lay/lay/layLogViewerDialog.h diff --git a/src/lay/layMacroController.cc b/src/lay/lay/layMacroController.cc similarity index 100% rename from src/lay/layMacroController.cc rename to src/lay/lay/layMacroController.cc diff --git a/src/lay/layMacroController.h b/src/lay/lay/layMacroController.h similarity index 100% rename from src/lay/layMacroController.h rename to src/lay/lay/layMacroController.h diff --git a/src/lay/layMacroEditorDialog.cc b/src/lay/lay/layMacroEditorDialog.cc similarity index 100% rename from src/lay/layMacroEditorDialog.cc rename to src/lay/lay/layMacroEditorDialog.cc diff --git a/src/lay/layMacroEditorDialog.h b/src/lay/lay/layMacroEditorDialog.h similarity index 100% rename from src/lay/layMacroEditorDialog.h rename to src/lay/lay/layMacroEditorDialog.h diff --git a/src/lay/layMacroEditorPage.cc b/src/lay/lay/layMacroEditorPage.cc similarity index 100% rename from src/lay/layMacroEditorPage.cc rename to src/lay/lay/layMacroEditorPage.cc diff --git a/src/lay/layMacroEditorPage.h b/src/lay/lay/layMacroEditorPage.h similarity index 100% rename from src/lay/layMacroEditorPage.h rename to src/lay/lay/layMacroEditorPage.h diff --git a/src/lay/layMacroEditorSetupDialog.cc b/src/lay/lay/layMacroEditorSetupDialog.cc similarity index 100% rename from src/lay/layMacroEditorSetupDialog.cc rename to src/lay/lay/layMacroEditorSetupDialog.cc diff --git a/src/lay/layMacroEditorSetupDialog.h b/src/lay/lay/layMacroEditorSetupDialog.h similarity index 100% rename from src/lay/layMacroEditorSetupDialog.h rename to src/lay/lay/layMacroEditorSetupDialog.h diff --git a/src/lay/layMacroEditorTree.cc b/src/lay/lay/layMacroEditorTree.cc similarity index 100% rename from src/lay/layMacroEditorTree.cc rename to src/lay/lay/layMacroEditorTree.cc diff --git a/src/lay/layMacroEditorTree.h b/src/lay/lay/layMacroEditorTree.h similarity index 100% rename from src/lay/layMacroEditorTree.h rename to src/lay/lay/layMacroEditorTree.h diff --git a/src/lay/layMacroPropertiesDialog.cc b/src/lay/lay/layMacroPropertiesDialog.cc similarity index 100% rename from src/lay/layMacroPropertiesDialog.cc rename to src/lay/lay/layMacroPropertiesDialog.cc diff --git a/src/lay/layMacroPropertiesDialog.h b/src/lay/lay/layMacroPropertiesDialog.h similarity index 100% rename from src/lay/layMacroPropertiesDialog.h rename to src/lay/lay/layMacroPropertiesDialog.h diff --git a/src/lay/layMacroTemplates.qrc b/src/lay/lay/layMacroTemplates.qrc similarity index 100% rename from src/lay/layMacroTemplates.qrc rename to src/lay/lay/layMacroTemplates.qrc diff --git a/src/lay/layMacroVariableView.cc b/src/lay/lay/layMacroVariableView.cc similarity index 100% rename from src/lay/layMacroVariableView.cc rename to src/lay/lay/layMacroVariableView.cc diff --git a/src/lay/layMacroVariableView.h b/src/lay/lay/layMacroVariableView.h similarity index 100% rename from src/lay/layMacroVariableView.h rename to src/lay/lay/layMacroVariableView.h diff --git a/src/lay/layMainConfigPages.cc b/src/lay/lay/layMainConfigPages.cc similarity index 100% rename from src/lay/layMainConfigPages.cc rename to src/lay/lay/layMainConfigPages.cc diff --git a/src/lay/layMainConfigPages.h b/src/lay/lay/layMainConfigPages.h similarity index 100% rename from src/lay/layMainConfigPages.h rename to src/lay/lay/layMainConfigPages.h diff --git a/src/lay/layMainWindow.cc b/src/lay/lay/layMainWindow.cc similarity index 100% rename from src/lay/layMainWindow.cc rename to src/lay/lay/layMainWindow.cc diff --git a/src/lay/layMainWindow.h b/src/lay/lay/layMainWindow.h similarity index 100% rename from src/lay/layMainWindow.h rename to src/lay/lay/layMainWindow.h diff --git a/src/lay/layNativePlugin.cc b/src/lay/lay/layNativePlugin.cc similarity index 100% rename from src/lay/layNativePlugin.cc rename to src/lay/lay/layNativePlugin.cc diff --git a/src/lay/layNativePlugin.h b/src/lay/lay/layNativePlugin.h similarity index 100% rename from src/lay/layNativePlugin.h rename to src/lay/lay/layNativePlugin.h diff --git a/src/lay/layNavigator.cc b/src/lay/lay/layNavigator.cc similarity index 100% rename from src/lay/layNavigator.cc rename to src/lay/lay/layNavigator.cc diff --git a/src/lay/layNavigator.h b/src/lay/lay/layNavigator.h similarity index 100% rename from src/lay/layNavigator.h rename to src/lay/lay/layNavigator.h diff --git a/src/lay/layProgress.cc b/src/lay/lay/layProgress.cc similarity index 100% rename from src/lay/layProgress.cc rename to src/lay/lay/layProgress.cc diff --git a/src/lay/layProgress.h b/src/lay/lay/layProgress.h similarity index 100% rename from src/lay/layProgress.h rename to src/lay/lay/layProgress.h diff --git a/src/lay/layProgressWidget.cc b/src/lay/lay/layProgressWidget.cc similarity index 100% rename from src/lay/layProgressWidget.cc rename to src/lay/lay/layProgressWidget.cc diff --git a/src/lay/layProgressWidget.h b/src/lay/lay/layProgressWidget.h similarity index 100% rename from src/lay/layProgressWidget.h rename to src/lay/lay/layProgressWidget.h diff --git a/src/lay/layResourceHelpProvider.cc b/src/lay/lay/layResourceHelpProvider.cc similarity index 100% rename from src/lay/layResourceHelpProvider.cc rename to src/lay/lay/layResourceHelpProvider.cc diff --git a/src/lay/layResourceHelpProvider.h b/src/lay/lay/layResourceHelpProvider.h similarity index 100% rename from src/lay/layResourceHelpProvider.h rename to src/lay/lay/layResourceHelpProvider.h diff --git a/src/lay/layResources.qrc b/src/lay/lay/layResources.qrc similarity index 100% rename from src/lay/layResources.qrc rename to src/lay/lay/layResources.qrc diff --git a/src/lay/layRuntimeErrorForm.cc b/src/lay/lay/layRuntimeErrorForm.cc similarity index 100% rename from src/lay/layRuntimeErrorForm.cc rename to src/lay/lay/layRuntimeErrorForm.cc diff --git a/src/lay/layRuntimeErrorForm.h b/src/lay/lay/layRuntimeErrorForm.h similarity index 100% rename from src/lay/layRuntimeErrorForm.h rename to src/lay/lay/layRuntimeErrorForm.h diff --git a/src/lay/laySalt.cc b/src/lay/lay/laySalt.cc similarity index 100% rename from src/lay/laySalt.cc rename to src/lay/lay/laySalt.cc diff --git a/src/lay/laySalt.h b/src/lay/lay/laySalt.h similarity index 100% rename from src/lay/laySalt.h rename to src/lay/lay/laySalt.h diff --git a/src/lay/laySaltController.cc b/src/lay/lay/laySaltController.cc similarity index 100% rename from src/lay/laySaltController.cc rename to src/lay/lay/laySaltController.cc diff --git a/src/lay/laySaltController.h b/src/lay/lay/laySaltController.h similarity index 100% rename from src/lay/laySaltController.h rename to src/lay/lay/laySaltController.h diff --git a/src/lay/laySaltDownloadManager.cc b/src/lay/lay/laySaltDownloadManager.cc similarity index 100% rename from src/lay/laySaltDownloadManager.cc rename to src/lay/lay/laySaltDownloadManager.cc diff --git a/src/lay/laySaltDownloadManager.h b/src/lay/lay/laySaltDownloadManager.h similarity index 100% rename from src/lay/laySaltDownloadManager.h rename to src/lay/lay/laySaltDownloadManager.h diff --git a/src/lay/laySaltGrain.cc b/src/lay/lay/laySaltGrain.cc similarity index 100% rename from src/lay/laySaltGrain.cc rename to src/lay/lay/laySaltGrain.cc diff --git a/src/lay/laySaltGrain.h b/src/lay/lay/laySaltGrain.h similarity index 100% rename from src/lay/laySaltGrain.h rename to src/lay/lay/laySaltGrain.h diff --git a/src/lay/laySaltGrainDetailsTextWidget.cc b/src/lay/lay/laySaltGrainDetailsTextWidget.cc similarity index 100% rename from src/lay/laySaltGrainDetailsTextWidget.cc rename to src/lay/lay/laySaltGrainDetailsTextWidget.cc diff --git a/src/lay/laySaltGrainDetailsTextWidget.h b/src/lay/lay/laySaltGrainDetailsTextWidget.h similarity index 100% rename from src/lay/laySaltGrainDetailsTextWidget.h rename to src/lay/lay/laySaltGrainDetailsTextWidget.h diff --git a/src/lay/laySaltGrainPropertiesDialog.cc b/src/lay/lay/laySaltGrainPropertiesDialog.cc similarity index 100% rename from src/lay/laySaltGrainPropertiesDialog.cc rename to src/lay/lay/laySaltGrainPropertiesDialog.cc diff --git a/src/lay/laySaltGrainPropertiesDialog.h b/src/lay/lay/laySaltGrainPropertiesDialog.h similarity index 100% rename from src/lay/laySaltGrainPropertiesDialog.h rename to src/lay/lay/laySaltGrainPropertiesDialog.h diff --git a/src/lay/laySaltGrains.cc b/src/lay/lay/laySaltGrains.cc similarity index 100% rename from src/lay/laySaltGrains.cc rename to src/lay/lay/laySaltGrains.cc diff --git a/src/lay/laySaltGrains.h b/src/lay/lay/laySaltGrains.h similarity index 100% rename from src/lay/laySaltGrains.h rename to src/lay/lay/laySaltGrains.h diff --git a/src/lay/laySaltManagerDialog.cc b/src/lay/lay/laySaltManagerDialog.cc similarity index 100% rename from src/lay/laySaltManagerDialog.cc rename to src/lay/lay/laySaltManagerDialog.cc diff --git a/src/lay/laySaltManagerDialog.h b/src/lay/lay/laySaltManagerDialog.h similarity index 100% rename from src/lay/laySaltManagerDialog.h rename to src/lay/lay/laySaltManagerDialog.h diff --git a/src/lay/laySaltModel.cc b/src/lay/lay/laySaltModel.cc similarity index 100% rename from src/lay/laySaltModel.cc rename to src/lay/lay/laySaltModel.cc diff --git a/src/lay/laySaltModel.h b/src/lay/lay/laySaltModel.h similarity index 100% rename from src/lay/laySaltModel.h rename to src/lay/lay/laySaltModel.h diff --git a/src/lay/laySaltTemplates.qrc b/src/lay/lay/laySaltTemplates.qrc similarity index 100% rename from src/lay/laySaltTemplates.qrc rename to src/lay/lay/laySaltTemplates.qrc diff --git a/src/lay/laySearchReplaceConfigPage.cc b/src/lay/lay/laySearchReplaceConfigPage.cc similarity index 100% rename from src/lay/laySearchReplaceConfigPage.cc rename to src/lay/lay/laySearchReplaceConfigPage.cc diff --git a/src/lay/laySearchReplaceConfigPage.h b/src/lay/lay/laySearchReplaceConfigPage.h similarity index 100% rename from src/lay/laySearchReplaceConfigPage.h rename to src/lay/lay/laySearchReplaceConfigPage.h diff --git a/src/lay/laySearchReplaceDialog.cc b/src/lay/lay/laySearchReplaceDialog.cc similarity index 100% rename from src/lay/laySearchReplaceDialog.cc rename to src/lay/lay/laySearchReplaceDialog.cc diff --git a/src/lay/laySearchReplaceDialog.h b/src/lay/lay/laySearchReplaceDialog.h similarity index 100% rename from src/lay/laySearchReplaceDialog.h rename to src/lay/lay/laySearchReplaceDialog.h diff --git a/src/lay/laySearchReplacePlugin.cc b/src/lay/lay/laySearchReplacePlugin.cc similarity index 100% rename from src/lay/laySearchReplacePlugin.cc rename to src/lay/lay/laySearchReplacePlugin.cc diff --git a/src/lay/laySearchReplacePropertiesWidgets.cc b/src/lay/lay/laySearchReplacePropertiesWidgets.cc similarity index 100% rename from src/lay/laySearchReplacePropertiesWidgets.cc rename to src/lay/lay/laySearchReplacePropertiesWidgets.cc diff --git a/src/lay/laySearchReplacePropertiesWidgets.h b/src/lay/lay/laySearchReplacePropertiesWidgets.h similarity index 100% rename from src/lay/laySearchReplacePropertiesWidgets.h rename to src/lay/lay/laySearchReplacePropertiesWidgets.h diff --git a/src/lay/laySelectCellViewForm.cc b/src/lay/lay/laySelectCellViewForm.cc similarity index 100% rename from src/lay/laySelectCellViewForm.cc rename to src/lay/lay/laySelectCellViewForm.cc diff --git a/src/lay/laySelectCellViewForm.h b/src/lay/lay/laySelectCellViewForm.h similarity index 100% rename from src/lay/laySelectCellViewForm.h rename to src/lay/lay/laySelectCellViewForm.h diff --git a/src/lay/laySession.cc b/src/lay/lay/laySession.cc similarity index 100% rename from src/lay/laySession.cc rename to src/lay/lay/laySession.cc diff --git a/src/lay/laySession.h b/src/lay/lay/laySession.h similarity index 100% rename from src/lay/laySession.h rename to src/lay/lay/laySession.h diff --git a/src/lay/laySettingsForm.cc b/src/lay/lay/laySettingsForm.cc similarity index 100% rename from src/lay/laySettingsForm.cc rename to src/lay/lay/laySettingsForm.cc diff --git a/src/lay/laySettingsForm.h b/src/lay/lay/laySettingsForm.h similarity index 100% rename from src/lay/laySettingsForm.h rename to src/lay/lay/laySettingsForm.h diff --git a/src/lay/laySignalHandler.cc b/src/lay/lay/laySignalHandler.cc similarity index 100% rename from src/lay/laySignalHandler.cc rename to src/lay/lay/laySignalHandler.cc diff --git a/src/lay/laySignalHandler.h b/src/lay/lay/laySignalHandler.h similarity index 100% rename from src/lay/laySignalHandler.h rename to src/lay/lay/laySignalHandler.h diff --git a/src/lay/layTechSetupDialog.cc b/src/lay/lay/layTechSetupDialog.cc similarity index 100% rename from src/lay/layTechSetupDialog.cc rename to src/lay/lay/layTechSetupDialog.cc diff --git a/src/lay/layTechSetupDialog.h b/src/lay/lay/layTechSetupDialog.h similarity index 100% rename from src/lay/layTechSetupDialog.h rename to src/lay/lay/layTechSetupDialog.h diff --git a/src/lay/layTechnologyController.cc b/src/lay/lay/layTechnologyController.cc similarity index 100% rename from src/lay/layTechnologyController.cc rename to src/lay/lay/layTechnologyController.cc diff --git a/src/lay/layTechnologyController.h b/src/lay/lay/layTechnologyController.h similarity index 100% rename from src/lay/layTechnologyController.h rename to src/lay/lay/layTechnologyController.h diff --git a/src/lay/layTextProgress.cc b/src/lay/lay/layTextProgress.cc similarity index 100% rename from src/lay/layTextProgress.cc rename to src/lay/lay/layTextProgress.cc diff --git a/src/lay/layTextProgress.h b/src/lay/lay/layTextProgress.h similarity index 100% rename from src/lay/layTextProgress.h rename to src/lay/lay/layTextProgress.h diff --git a/src/lay/layVersion.cc b/src/lay/lay/layVersion.cc similarity index 100% rename from src/lay/layVersion.cc rename to src/lay/lay/layVersion.cc diff --git a/src/lay/layVersion.h b/src/lay/lay/layVersion.h similarity index 100% rename from src/lay/layVersion.h rename to src/lay/lay/layVersion.h diff --git a/src/lay/macro_templates/index.txt b/src/lay/lay/macro_templates/index.txt similarity index 100% rename from src/lay/macro_templates/index.txt rename to src/lay/lay/macro_templates/index.txt diff --git a/src/lay/macro_templates/new_macro.lym b/src/lay/lay/macro_templates/new_macro.lym similarity index 100% rename from src/lay/macro_templates/new_macro.lym rename to src/lay/lay/macro_templates/new_macro.lym diff --git a/src/lay/macro_templates/new_python_file.py b/src/lay/lay/macro_templates/new_python_file.py similarity index 100% rename from src/lay/macro_templates/new_python_file.py rename to src/lay/lay/macro_templates/new_python_file.py diff --git a/src/lay/macro_templates/new_python_macro.lym b/src/lay/lay/macro_templates/new_python_macro.lym similarity index 100% rename from src/lay/macro_templates/new_python_macro.lym rename to src/lay/lay/macro_templates/new_python_macro.lym diff --git a/src/lay/macro_templates/new_ruby_file.rb b/src/lay/lay/macro_templates/new_ruby_file.rb similarity index 100% rename from src/lay/macro_templates/new_ruby_file.rb rename to src/lay/lay/macro_templates/new_ruby_file.rb diff --git a/src/lay/macro_templates/new_text_file.txt b/src/lay/lay/macro_templates/new_text_file.txt similarity index 100% rename from src/lay/macro_templates/new_text_file.txt rename to src/lay/lay/macro_templates/new_text_file.txt diff --git a/src/lay/macro_templates/pcell.lym b/src/lay/lay/macro_templates/pcell.lym similarity index 100% rename from src/lay/macro_templates/pcell.lym rename to src/lay/lay/macro_templates/pcell.lym diff --git a/src/lay/macro_templates/pcell_python.lym b/src/lay/lay/macro_templates/pcell_python.lym similarity index 100% rename from src/lay/macro_templates/pcell_python.lym rename to src/lay/lay/macro_templates/pcell_python.lym diff --git a/src/lay/macro_templates/pcell_sample.lym b/src/lay/lay/macro_templates/pcell_sample.lym similarity index 100% rename from src/lay/macro_templates/pcell_sample.lym rename to src/lay/lay/macro_templates/pcell_sample.lym diff --git a/src/lay/macro_templates/pcell_sample_python.lym b/src/lay/lay/macro_templates/pcell_sample_python.lym similarity index 100% rename from src/lay/macro_templates/pcell_sample_python.lym rename to src/lay/lay/macro_templates/pcell_sample_python.lym diff --git a/src/lay/macro_templates/qt_designer.lym b/src/lay/lay/macro_templates/qt_designer.lym similarity index 100% rename from src/lay/macro_templates/qt_designer.lym rename to src/lay/lay/macro_templates/qt_designer.lym diff --git a/src/lay/macro_templates/qt_designer.ui b/src/lay/lay/macro_templates/qt_designer.ui similarity index 100% rename from src/lay/macro_templates/qt_designer.ui rename to src/lay/lay/macro_templates/qt_designer.ui diff --git a/src/lay/macro_templates/qt_designer_python.lym b/src/lay/lay/macro_templates/qt_designer_python.lym similarity index 100% rename from src/lay/macro_templates/qt_designer_python.lym rename to src/lay/lay/macro_templates/qt_designer_python.lym diff --git a/src/lay/macro_templates/qt_dialog.lym b/src/lay/lay/macro_templates/qt_dialog.lym similarity index 100% rename from src/lay/macro_templates/qt_dialog.lym rename to src/lay/lay/macro_templates/qt_dialog.lym diff --git a/src/lay/macro_templates/qt_dialog_python.lym b/src/lay/lay/macro_templates/qt_dialog_python.lym similarity index 100% rename from src/lay/macro_templates/qt_dialog_python.lym rename to src/lay/lay/macro_templates/qt_dialog_python.lym diff --git a/src/lay/macro_templates/qt_server.lym b/src/lay/lay/macro_templates/qt_server.lym similarity index 100% rename from src/lay/macro_templates/qt_server.lym rename to src/lay/lay/macro_templates/qt_server.lym diff --git a/src/lay/macro_templates/qt_server_python.lym b/src/lay/lay/macro_templates/qt_server_python.lym similarity index 100% rename from src/lay/macro_templates/qt_server_python.lym rename to src/lay/lay/macro_templates/qt_server_python.lym diff --git a/src/lay/salt_templates/drc/doc/readme.html b/src/lay/lay/salt_templates/drc/doc/readme.html similarity index 100% rename from src/lay/salt_templates/drc/doc/readme.html rename to src/lay/lay/salt_templates/drc/doc/readme.html diff --git a/src/lay/salt_templates/drc/drc/new_drc.lym b/src/lay/lay/salt_templates/drc/drc/new_drc.lym similarity index 100% rename from src/lay/salt_templates/drc/drc/new_drc.lym rename to src/lay/lay/salt_templates/drc/drc/new_drc.lym diff --git a/src/lay/salt_templates/drc/grain.xml b/src/lay/lay/salt_templates/drc/grain.xml similarity index 100% rename from src/lay/salt_templates/drc/grain.xml rename to src/lay/lay/salt_templates/drc/grain.xml diff --git a/src/lay/salt_templates/font/doc/readme.html b/src/lay/lay/salt_templates/font/doc/readme.html similarity index 100% rename from src/lay/salt_templates/font/doc/readme.html rename to src/lay/lay/salt_templates/font/doc/readme.html diff --git a/src/lay/salt_templates/font/fonts/new_font.gds b/src/lay/lay/salt_templates/font/fonts/new_font.gds similarity index 100% rename from src/lay/salt_templates/font/fonts/new_font.gds rename to src/lay/lay/salt_templates/font/fonts/new_font.gds diff --git a/src/lay/salt_templates/font/grain.xml b/src/lay/lay/salt_templates/font/grain.xml similarity index 100% rename from src/lay/salt_templates/font/grain.xml rename to src/lay/lay/salt_templates/font/grain.xml diff --git a/src/lay/salt_templates/lib/doc/readme.html b/src/lay/lay/salt_templates/lib/doc/readme.html similarity index 100% rename from src/lay/salt_templates/lib/doc/readme.html rename to src/lay/lay/salt_templates/lib/doc/readme.html diff --git a/src/lay/salt_templates/lib/grain.xml b/src/lay/lay/salt_templates/lib/grain.xml similarity index 100% rename from src/lay/salt_templates/lib/grain.xml rename to src/lay/lay/salt_templates/lib/grain.xml diff --git a/src/lay/salt_templates/lib/libraries/new_lib.gds b/src/lay/lay/salt_templates/lib/libraries/new_lib.gds similarity index 100% rename from src/lay/salt_templates/lib/libraries/new_lib.gds rename to src/lay/lay/salt_templates/lib/libraries/new_lib.gds diff --git a/src/lay/salt_templates/macro/doc/readme.html b/src/lay/lay/salt_templates/macro/doc/readme.html similarity index 100% rename from src/lay/salt_templates/macro/doc/readme.html rename to src/lay/lay/salt_templates/macro/doc/readme.html diff --git a/src/lay/salt_templates/macro/grain.xml b/src/lay/lay/salt_templates/macro/grain.xml similarity index 100% rename from src/lay/salt_templates/macro/grain.xml rename to src/lay/lay/salt_templates/macro/grain.xml diff --git a/src/lay/salt_templates/macro/macros/new_macro.lym b/src/lay/lay/salt_templates/macro/macros/new_macro.lym similarity index 100% rename from src/lay/salt_templates/macro/macros/new_macro.lym rename to src/lay/lay/salt_templates/macro/macros/new_macro.lym diff --git a/src/lay/salt_templates/pcell_lib/doc/readme.html b/src/lay/lay/salt_templates/pcell_lib/doc/readme.html similarity index 100% rename from src/lay/salt_templates/pcell_lib/doc/readme.html rename to src/lay/lay/salt_templates/pcell_lib/doc/readme.html diff --git a/src/lay/salt_templates/pcell_lib/grain.xml b/src/lay/lay/salt_templates/pcell_lib/grain.xml similarity index 100% rename from src/lay/salt_templates/pcell_lib/grain.xml rename to src/lay/lay/salt_templates/pcell_lib/grain.xml diff --git a/src/lay/salt_templates/pcell_lib/macros/pcell.lym b/src/lay/lay/salt_templates/pcell_lib/macros/pcell.lym similarity index 100% rename from src/lay/salt_templates/pcell_lib/macros/pcell.lym rename to src/lay/lay/salt_templates/pcell_lib/macros/pcell.lym diff --git a/src/lay/salt_templates/pymacro/doc/readme.html b/src/lay/lay/salt_templates/pymacro/doc/readme.html similarity index 100% rename from src/lay/salt_templates/pymacro/doc/readme.html rename to src/lay/lay/salt_templates/pymacro/doc/readme.html diff --git a/src/lay/salt_templates/pymacro/grain.xml b/src/lay/lay/salt_templates/pymacro/grain.xml similarity index 100% rename from src/lay/salt_templates/pymacro/grain.xml rename to src/lay/lay/salt_templates/pymacro/grain.xml diff --git a/src/lay/salt_templates/pymacro/pymacros/new_macro.lym b/src/lay/lay/salt_templates/pymacro/pymacros/new_macro.lym similarity index 100% rename from src/lay/salt_templates/pymacro/pymacros/new_macro.lym rename to src/lay/lay/salt_templates/pymacro/pymacros/new_macro.lym diff --git a/src/lay/salt_templates/python_lib/doc/readme.html b/src/lay/lay/salt_templates/python_lib/doc/readme.html similarity index 100% rename from src/lay/salt_templates/python_lib/doc/readme.html rename to src/lay/lay/salt_templates/python_lib/doc/readme.html diff --git a/src/lay/salt_templates/python_lib/grain.xml b/src/lay/lay/salt_templates/python_lib/grain.xml similarity index 100% rename from src/lay/salt_templates/python_lib/grain.xml rename to src/lay/lay/salt_templates/python_lib/grain.xml diff --git a/src/lay/salt_templates/python_lib/python/new_object.py b/src/lay/lay/salt_templates/python_lib/python/new_object.py similarity index 100% rename from src/lay/salt_templates/python_lib/python/new_object.py rename to src/lay/lay/salt_templates/python_lib/python/new_object.py diff --git a/src/lay/salt_templates/ruby_lib/doc/readme.html b/src/lay/lay/salt_templates/ruby_lib/doc/readme.html similarity index 100% rename from src/lay/salt_templates/ruby_lib/doc/readme.html rename to src/lay/lay/salt_templates/ruby_lib/doc/readme.html diff --git a/src/lay/salt_templates/ruby_lib/grain.xml b/src/lay/lay/salt_templates/ruby_lib/grain.xml similarity index 100% rename from src/lay/salt_templates/ruby_lib/grain.xml rename to src/lay/lay/salt_templates/ruby_lib/grain.xml diff --git a/src/lay/salt_templates/ruby_lib/ruby/new_object.rb b/src/lay/lay/salt_templates/ruby_lib/ruby/new_object.rb similarity index 100% rename from src/lay/salt_templates/ruby_lib/ruby/new_object.rb rename to src/lay/lay/salt_templates/ruby_lib/ruby/new_object.rb diff --git a/src/lay/salt_templates/tech/doc/readme.html b/src/lay/lay/salt_templates/tech/doc/readme.html similarity index 100% rename from src/lay/salt_templates/tech/doc/readme.html rename to src/lay/lay/salt_templates/tech/doc/readme.html diff --git a/src/lay/salt_templates/tech/grain.xml b/src/lay/lay/salt_templates/tech/grain.xml similarity index 100% rename from src/lay/salt_templates/tech/grain.xml rename to src/lay/lay/salt_templates/tech/grain.xml diff --git a/src/lay/salt_templates/tech/tech/tech.lyt b/src/lay/lay/salt_templates/tech/tech/tech.lyt similarity index 100% rename from src/lay/salt_templates/tech/tech/tech.lyt rename to src/lay/lay/salt_templates/tech/tech/tech.lyt diff --git a/src/lay/syntax/python.xml b/src/lay/lay/syntax/python.xml similarity index 100% rename from src/lay/syntax/python.xml rename to src/lay/lay/syntax/python.xml diff --git a/src/lay/syntax/ruby.xml b/src/lay/lay/syntax/ruby.xml similarity index 100% rename from src/lay/syntax/ruby.xml rename to src/lay/lay/syntax/ruby.xml diff --git a/src/lay/tree.stxml b/src/lay/lay/tree.stxml similarity index 100% rename from src/lay/tree.stxml rename to src/lay/lay/tree.stxml diff --git a/src/unit_tests/laySalt.cc b/src/lay/unit_tests/laySalt.cc similarity index 100% rename from src/unit_tests/laySalt.cc rename to src/lay/unit_tests/laySalt.cc diff --git a/src/lay/unit_tests/unit_tests.pro b/src/lay/unit_tests/unit_tests.pro new file mode 100644 index 000000000..48f722767 --- /dev/null +++ b/src/lay/unit_tests/unit_tests.pro @@ -0,0 +1,16 @@ + +DESTDIR_UT = $$OUT_PWD/../.. +DESTDIR = $$OUT_PWD/.. + +TARGET = lay_tests + +include($$PWD/../../lib_ut.pri) + +SOURCES = \ + laySalt.cc \ + +INCLUDEPATH += $$LAY_INC $$TL_INC $$LAYBASIC_INC $$DB_INC $$GSI_INC $$UT_INC +DEPENDPATH += $$LAY_INC $$TL_INC $$LAYBASIC_INC $$DB_INC $$GSI_INC $$UT_INC + +LIBS += -L$$DESTDIR_UT -lklayout_lay -lklayout_laybasic -lklayout_db -lklayout_tl -lklayout_gsi -lklayout_ut + diff --git a/src/laybasic/laybasic.pro b/src/laybasic/laybasic.pro index c9e3bcb15..5350550e4 100644 --- a/src/laybasic/laybasic.pro +++ b/src/laybasic/laybasic.pro @@ -1,286 +1,6 @@ -DESTDIR = $$OUT_PWD/.. -TARGET = klayout_laybasic +TEMPLATE = subdirs +SUBDIRS = laybasic unit_tests -include($$PWD/../lib.pri) - -DEFINES += MAKE_LAYBASIC_LIBRARY - -FORMS = \ - AlignCellOptionsDialog.ui \ - BookmarkManagementForm.ui \ - BrowseInstancesConfigPage.ui \ - BrowseInstancesForm.ui \ - BrowserDialog.ui \ - BrowserPanel.ui \ - BrowseShapesConfigPage.ui \ - BrowseShapesForm.ui \ - CIFReaderOptionPage.ui \ - CIFWriterOptionPage.ui \ - CellSelectionForm.ui \ - ClearLayerModeDialog.ui \ - ConfigurationDialog.ui \ - CopyCellModeDialog.ui \ - DXFReaderOptionPage.ui \ - DXFWriterOptionPage.ui \ - DeleteCellModeDialog.ui \ - DuplicateLayerDialog.ui \ - EditStipplesForm.ui \ - FlattenInstOptionsDialog.ui \ - GDS2ReaderOptionPage.ui \ - GDS2WriterOptionPage.ui \ - GridNetConfigPage.ui \ - LayerMappingWidget.ui \ - LayerSourceDialog.ui \ - LayoutProperties.ui \ - LayoutViewConfigPage1.ui \ - LayoutViewConfigPage2a.ui \ - LayoutViewConfigPage2b.ui \ - LayoutViewConfigPage2c.ui \ - LayoutViewConfigPage3a.ui \ - LayoutViewConfigPage3b.ui \ - LayoutViewConfigPage3c.ui \ - LayoutViewConfigPage3f.ui \ - LayoutViewConfigPage4.ui \ - LayoutViewConfigPage5.ui \ - LayoutViewConfigPage6.ui \ - LayoutViewConfigPage7.ui \ - LayoutViewConfigPage.ui \ - LibraryCellSelectionForm.ui \ - LoadLayoutOptionsDialog.ui \ - MarkerBrowserConfigPage2.ui \ - MarkerBrowserConfigPage.ui \ - MarkerBrowserDialog.ui \ - MarkerBrowserPage.ui \ - MarkerBrowserSnapshotView.ui \ - MoveOptionsDialog.ui \ - MoveToOptionsDialog.ui \ - NewCellPropertiesDialog.ui \ - NewLayerPropertiesDialog.ui \ - NewLayoutPropertiesDialog.ui \ - OASISWriterOptionPage.ui \ - OpenLayoutModeDialog.ui \ - PropertiesDialog.ui \ - RenameCellDialog.ui \ - ReplaceCellOptionsDialog.ui \ - SaveLayoutOptionsDialog.ui \ - SaveLayoutAsOptionsDialog.ui \ - SelectStippleForm.ui \ - TipDialog.ui \ - UserPropertiesForm.ui \ - UserPropertiesEditForm.ui \ - SpecificLoadLayoutOptionsDialog.ui \ - CommonReaderOptionsPage.ui \ - SelectLineStyleForm.ui \ - LayoutViewConfigPage6a.ui \ - EditLineStylesForm.ui - -RESOURCES = \ - -SOURCES = \ - gtf.cc \ - gsiDeclLayDialogs.cc \ - gsiDeclLayLayers.cc \ - gsiDeclLayLayoutView.cc \ - gsiDeclLayMarker.cc \ - gsiDeclLayMenu.cc \ - gsiDeclLayPlugin.cc \ - gsiDeclLayStream.cc \ - layAbstractMenu.cc \ - layAbstractMenuProvider.cc \ - layAnnotationShapes.cc \ - layBitmap.cc \ - layBitmapRenderer.cc \ - layBitmapsToImage.cc \ - layBookmarkList.cc \ - layBookmarkManagementForm.cc \ - layBrowseInstancesForm.cc \ - layBrowser.cc \ - layBrowserDialog.cc \ - layBrowserPanel.cc \ - layBrowseShapesForm.cc \ - layCanvasPlane.cc \ - layCellSelectionForm.cc \ - layCellTreeModel.cc \ - layCellView.cc \ - layCIFReaderPlugin.cc \ - layCIFWriterPlugin.cc \ - layColorPalette.cc \ - layConfigurationDialog.cc \ - layConverters.cc \ - layCursor.cc \ - layDialogs.cc \ - layDisplayState.cc \ - layDitherPattern.cc \ - layDrawing.cc \ - layDXFReaderPlugin.cc \ - layDXFWriterPlugin.cc \ - layEditable.cc \ - layEditStipplesForm.cc \ - layEditStippleWidget.cc \ - layFileDialog.cc \ - layFinder.cc \ - layFixedFont.cc \ - layGDS2ReaderPlugin.cc \ - layGDS2WriterPlugin.cc \ - layGridNet.cc \ - layHierarchyControlPanel.cc \ - layLayerControlPanel.cc \ - layLayerMappingWidget.cc \ - layLayerProperties.cc \ - layLayerToolbox.cc \ - layLayerTreeModel.cc \ - layLayoutCanvas.cc \ - layLayoutPropertiesForm.cc \ - layLayoutView.cc \ - layLayoutViewConfigPages.cc \ - layLoadLayoutOptionsDialog.cc \ - layMarker.cc \ - layMouseTracker.cc \ - layMove.cc \ - layOASISWriterPlugin.cc \ - layObjectInstPath.cc \ - layParsedLayerSource.cc \ - layPlugin.cc \ - layProperties.cc \ - layPropertiesDialog.cc \ - layQtTools.cc \ - layRedrawLayerInfo.cc \ - layRedrawThreadCanvas.cc \ - layRedrawThread.cc \ - layRedrawThreadWorker.cc \ - layRenderer.cc \ - layRubberBox.cc \ - laySaveLayoutOptionsDialog.cc \ - laySelector.cc \ - laySelectStippleForm.cc \ - laySnap.cc \ - layStipplePalette.cc \ - layStream.cc \ - layTechnology.cc \ - layTipDialog.cc \ - layViewObject.cc \ - layViewOp.cc \ - layViewport.cc \ - layWidgets.cc \ - layZoomBox.cc \ - rdbInfoWidget.cc \ - rdbMarkerBrowser.cc \ - rdbMarkerBrowserDialog.cc \ - rdbMarkerBrowserPage.cc \ - layOASISReaderPlugin.cc \ - layCommonReaderPlugin.cc \ - layLineStyles.cc \ - laySelectLineStyleForm.cc \ - layLineStylePalette.cc \ - layEditLineStylesForm.cc \ - layEditLineStyleWidget.cc \ - layBackgroundAwareTreeStyle.cc \ - gsiDeclLayTechnologies.cc - -HEADERS = \ - gtf.h \ - layAbstractMenu.h \ - layAbstractMenuProvider.h \ - layAnnotationShapes.h \ - layBitmap.h \ - layBitmapRenderer.h \ - layBitmapsToImage.h \ - layBookmarkList.h \ - layBookmarkManagementForm.h \ - layBrowseInstancesForm.h \ - layBrowserDialog.h \ - layBrowser.h \ - layBrowserPanel.h \ - layBrowseShapesForm.h \ - layCanvasPlane.h \ - layCellSelectionForm.h \ - layCellTreeModel.h \ - layCellView.h \ - layCIFReaderPlugin.h \ - layCIFWriterPlugin.h \ - layColorPalette.h \ - layConfigurationDialog.h \ - layConverters.h \ - layCursor.h \ - layDialogs.h \ - layDisplayState.h \ - layDitherPattern.h \ - layDrawing.h \ - layDXFReaderPlugin.h \ - layDXFWriterPlugin.h \ - layEditable.h \ - layEditStipplesForm.h \ - layEditStippleWidget.h \ - layFileDialog.h \ - layFinder.h \ - layFixedFont.h \ - layGDS2ReaderPlugin.h \ - layGDS2WriterPlugin.h \ - layGridNet.h \ - layHierarchyControlPanel.h \ - layLayerControlPanel.h \ - layLayerMappingWidget.h \ - layLayerProperties.h \ - layLayerToolbox.h \ - layLayerTreeModel.h \ - layLayoutCanvas.h \ - layLayoutPropertiesForm.h \ - layLayoutViewConfigPages.h \ - layLayoutView.h \ - layLoadLayoutOptionsDialog.h \ - layMarker.h \ - layMouseTracker.h \ - layMove.h \ - layOASISWriterPlugin.h \ - layObjectInstPath.h \ - layParsedLayerSource.h \ - layPlugin.h \ - layPropertiesDialog.h \ - layProperties.h \ - layQtTools.h \ - layRedrawLayerInfo.h \ - layRedrawThreadCanvas.h \ - layRedrawThread.h \ - layRedrawThreadWorker.h \ - layRenderer.h \ - layRubberBox.h \ - laySaveLayoutOptionsDialog.h \ - laySelector.h \ - laySelectStippleForm.h \ - laySnap.h \ - layStipplePalette.h \ - layStream.h \ - layTechnology.h \ - layTipDialog.h \ - layViewObject.h \ - layViewOp.h \ - layViewport.h \ - layWidgets.h \ - layZoomBox.h \ - rdbInfoWidget.h \ - rdbMarkerBrowserDialog.h \ - rdbMarkerBrowser.h \ - rdbMarkerBrowserPage.h \ - layOASISReaderPlugin.h \ - layCommonReaderPlugin.h \ - layLineStyles.h \ - laySelectLineStyleForm.h \ - layLineStylePalette.h \ - layEditLineStylesForm.h \ - layEditLineStyleWidget.h \ - laybasicCommon.h \ - laybasicConfig.h \ - layBackgroundAwareTreeStyle.h - -INCLUDEPATH += $$TL_INC $$GSI_INC $$DB_INC $$RDB_INC -DEPENDPATH += $$TL_INC $$GSI_INC $$DB_INC $$RDB_INC -LIBS += -L$$DESTDIR -lklayout_tl -lklayout_gsi -lklayout_db -lklayout_rdb - -INCLUDEPATH += $$GSIQT_INC -DEPENDPATH += $$GSIQT_INC - -equals(HAVE_QTBINDINGS, "1") { - LIBS += -lklayout_gsiqt -} +unit_tests.depends += laybasic diff --git a/src/laybasic/AlignCellOptionsDialog.ui b/src/laybasic/laybasic/AlignCellOptionsDialog.ui similarity index 100% rename from src/laybasic/AlignCellOptionsDialog.ui rename to src/laybasic/laybasic/AlignCellOptionsDialog.ui diff --git a/src/laybasic/BookmarkManagementForm.ui b/src/laybasic/laybasic/BookmarkManagementForm.ui similarity index 100% rename from src/laybasic/BookmarkManagementForm.ui rename to src/laybasic/laybasic/BookmarkManagementForm.ui diff --git a/src/laybasic/BrowseInstancesConfigPage.ui b/src/laybasic/laybasic/BrowseInstancesConfigPage.ui similarity index 100% rename from src/laybasic/BrowseInstancesConfigPage.ui rename to src/laybasic/laybasic/BrowseInstancesConfigPage.ui diff --git a/src/laybasic/BrowseInstancesForm.ui b/src/laybasic/laybasic/BrowseInstancesForm.ui similarity index 100% rename from src/laybasic/BrowseInstancesForm.ui rename to src/laybasic/laybasic/BrowseInstancesForm.ui diff --git a/src/laybasic/BrowseShapesConfigPage.ui b/src/laybasic/laybasic/BrowseShapesConfigPage.ui similarity index 100% rename from src/laybasic/BrowseShapesConfigPage.ui rename to src/laybasic/laybasic/BrowseShapesConfigPage.ui diff --git a/src/laybasic/BrowseShapesForm.ui b/src/laybasic/laybasic/BrowseShapesForm.ui similarity index 100% rename from src/laybasic/BrowseShapesForm.ui rename to src/laybasic/laybasic/BrowseShapesForm.ui diff --git a/src/laybasic/BrowserDialog.ui b/src/laybasic/laybasic/BrowserDialog.ui similarity index 100% rename from src/laybasic/BrowserDialog.ui rename to src/laybasic/laybasic/BrowserDialog.ui diff --git a/src/laybasic/BrowserPanel.ui b/src/laybasic/laybasic/BrowserPanel.ui similarity index 100% rename from src/laybasic/BrowserPanel.ui rename to src/laybasic/laybasic/BrowserPanel.ui diff --git a/src/laybasic/CIFReaderOptionPage.ui b/src/laybasic/laybasic/CIFReaderOptionPage.ui similarity index 100% rename from src/laybasic/CIFReaderOptionPage.ui rename to src/laybasic/laybasic/CIFReaderOptionPage.ui diff --git a/src/laybasic/CIFWriterOptionPage.ui b/src/laybasic/laybasic/CIFWriterOptionPage.ui similarity index 100% rename from src/laybasic/CIFWriterOptionPage.ui rename to src/laybasic/laybasic/CIFWriterOptionPage.ui diff --git a/src/laybasic/CellSelectionForm.ui b/src/laybasic/laybasic/CellSelectionForm.ui similarity index 100% rename from src/laybasic/CellSelectionForm.ui rename to src/laybasic/laybasic/CellSelectionForm.ui diff --git a/src/laybasic/ClearLayerModeDialog.ui b/src/laybasic/laybasic/ClearLayerModeDialog.ui similarity index 100% rename from src/laybasic/ClearLayerModeDialog.ui rename to src/laybasic/laybasic/ClearLayerModeDialog.ui diff --git a/src/laybasic/CommonReaderOptionsPage.ui b/src/laybasic/laybasic/CommonReaderOptionsPage.ui similarity index 100% rename from src/laybasic/CommonReaderOptionsPage.ui rename to src/laybasic/laybasic/CommonReaderOptionsPage.ui diff --git a/src/laybasic/ConfigurationDialog.ui b/src/laybasic/laybasic/ConfigurationDialog.ui similarity index 100% rename from src/laybasic/ConfigurationDialog.ui rename to src/laybasic/laybasic/ConfigurationDialog.ui diff --git a/src/laybasic/CopyCellModeDialog.ui b/src/laybasic/laybasic/CopyCellModeDialog.ui similarity index 100% rename from src/laybasic/CopyCellModeDialog.ui rename to src/laybasic/laybasic/CopyCellModeDialog.ui diff --git a/src/laybasic/DXFReaderOptionPage.ui b/src/laybasic/laybasic/DXFReaderOptionPage.ui similarity index 100% rename from src/laybasic/DXFReaderOptionPage.ui rename to src/laybasic/laybasic/DXFReaderOptionPage.ui diff --git a/src/laybasic/DXFWriterOptionPage.ui b/src/laybasic/laybasic/DXFWriterOptionPage.ui similarity index 100% rename from src/laybasic/DXFWriterOptionPage.ui rename to src/laybasic/laybasic/DXFWriterOptionPage.ui diff --git a/src/laybasic/DeleteCellModeDialog.ui b/src/laybasic/laybasic/DeleteCellModeDialog.ui similarity index 100% rename from src/laybasic/DeleteCellModeDialog.ui rename to src/laybasic/laybasic/DeleteCellModeDialog.ui diff --git a/src/laybasic/DuplicateLayerDialog.ui b/src/laybasic/laybasic/DuplicateLayerDialog.ui similarity index 100% rename from src/laybasic/DuplicateLayerDialog.ui rename to src/laybasic/laybasic/DuplicateLayerDialog.ui diff --git a/src/laybasic/EditLineStylesForm.ui b/src/laybasic/laybasic/EditLineStylesForm.ui similarity index 100% rename from src/laybasic/EditLineStylesForm.ui rename to src/laybasic/laybasic/EditLineStylesForm.ui diff --git a/src/laybasic/EditStipplesForm.ui b/src/laybasic/laybasic/EditStipplesForm.ui similarity index 100% rename from src/laybasic/EditStipplesForm.ui rename to src/laybasic/laybasic/EditStipplesForm.ui diff --git a/src/laybasic/FlattenInstOptionsDialog.ui b/src/laybasic/laybasic/FlattenInstOptionsDialog.ui similarity index 100% rename from src/laybasic/FlattenInstOptionsDialog.ui rename to src/laybasic/laybasic/FlattenInstOptionsDialog.ui diff --git a/src/laybasic/GDS2ReaderOptionPage.ui b/src/laybasic/laybasic/GDS2ReaderOptionPage.ui similarity index 100% rename from src/laybasic/GDS2ReaderOptionPage.ui rename to src/laybasic/laybasic/GDS2ReaderOptionPage.ui diff --git a/src/laybasic/GDS2WriterOptionPage.ui b/src/laybasic/laybasic/GDS2WriterOptionPage.ui similarity index 100% rename from src/laybasic/GDS2WriterOptionPage.ui rename to src/laybasic/laybasic/GDS2WriterOptionPage.ui diff --git a/src/laybasic/GridNetConfigPage.ui b/src/laybasic/laybasic/GridNetConfigPage.ui similarity index 100% rename from src/laybasic/GridNetConfigPage.ui rename to src/laybasic/laybasic/GridNetConfigPage.ui diff --git a/src/laybasic/LayerMappingWidget.ui b/src/laybasic/laybasic/LayerMappingWidget.ui similarity index 100% rename from src/laybasic/LayerMappingWidget.ui rename to src/laybasic/laybasic/LayerMappingWidget.ui diff --git a/src/laybasic/LayerSourceDialog.ui b/src/laybasic/laybasic/LayerSourceDialog.ui similarity index 100% rename from src/laybasic/LayerSourceDialog.ui rename to src/laybasic/laybasic/LayerSourceDialog.ui diff --git a/src/laybasic/LayoutProperties.ui b/src/laybasic/laybasic/LayoutProperties.ui similarity index 100% rename from src/laybasic/LayoutProperties.ui rename to src/laybasic/laybasic/LayoutProperties.ui diff --git a/src/laybasic/LayoutViewConfigPage.ui b/src/laybasic/laybasic/LayoutViewConfigPage.ui similarity index 100% rename from src/laybasic/LayoutViewConfigPage.ui rename to src/laybasic/laybasic/LayoutViewConfigPage.ui diff --git a/src/laybasic/LayoutViewConfigPage1.ui b/src/laybasic/laybasic/LayoutViewConfigPage1.ui similarity index 100% rename from src/laybasic/LayoutViewConfigPage1.ui rename to src/laybasic/laybasic/LayoutViewConfigPage1.ui diff --git a/src/laybasic/LayoutViewConfigPage2a.ui b/src/laybasic/laybasic/LayoutViewConfigPage2a.ui similarity index 100% rename from src/laybasic/LayoutViewConfigPage2a.ui rename to src/laybasic/laybasic/LayoutViewConfigPage2a.ui diff --git a/src/laybasic/LayoutViewConfigPage2b.ui b/src/laybasic/laybasic/LayoutViewConfigPage2b.ui similarity index 100% rename from src/laybasic/LayoutViewConfigPage2b.ui rename to src/laybasic/laybasic/LayoutViewConfigPage2b.ui diff --git a/src/laybasic/LayoutViewConfigPage2c.ui b/src/laybasic/laybasic/LayoutViewConfigPage2c.ui similarity index 100% rename from src/laybasic/LayoutViewConfigPage2c.ui rename to src/laybasic/laybasic/LayoutViewConfigPage2c.ui diff --git a/src/laybasic/LayoutViewConfigPage3a.ui b/src/laybasic/laybasic/LayoutViewConfigPage3a.ui similarity index 100% rename from src/laybasic/LayoutViewConfigPage3a.ui rename to src/laybasic/laybasic/LayoutViewConfigPage3a.ui diff --git a/src/laybasic/LayoutViewConfigPage3b.ui b/src/laybasic/laybasic/LayoutViewConfigPage3b.ui similarity index 100% rename from src/laybasic/LayoutViewConfigPage3b.ui rename to src/laybasic/laybasic/LayoutViewConfigPage3b.ui diff --git a/src/laybasic/LayoutViewConfigPage3c.ui b/src/laybasic/laybasic/LayoutViewConfigPage3c.ui similarity index 100% rename from src/laybasic/LayoutViewConfigPage3c.ui rename to src/laybasic/laybasic/LayoutViewConfigPage3c.ui diff --git a/src/laybasic/LayoutViewConfigPage3f.ui b/src/laybasic/laybasic/LayoutViewConfigPage3f.ui similarity index 100% rename from src/laybasic/LayoutViewConfigPage3f.ui rename to src/laybasic/laybasic/LayoutViewConfigPage3f.ui diff --git a/src/laybasic/LayoutViewConfigPage4.ui b/src/laybasic/laybasic/LayoutViewConfigPage4.ui similarity index 100% rename from src/laybasic/LayoutViewConfigPage4.ui rename to src/laybasic/laybasic/LayoutViewConfigPage4.ui diff --git a/src/laybasic/LayoutViewConfigPage5.ui b/src/laybasic/laybasic/LayoutViewConfigPage5.ui similarity index 100% rename from src/laybasic/LayoutViewConfigPage5.ui rename to src/laybasic/laybasic/LayoutViewConfigPage5.ui diff --git a/src/laybasic/LayoutViewConfigPage6.ui b/src/laybasic/laybasic/LayoutViewConfigPage6.ui similarity index 100% rename from src/laybasic/LayoutViewConfigPage6.ui rename to src/laybasic/laybasic/LayoutViewConfigPage6.ui diff --git a/src/laybasic/LayoutViewConfigPage6a.ui b/src/laybasic/laybasic/LayoutViewConfigPage6a.ui similarity index 100% rename from src/laybasic/LayoutViewConfigPage6a.ui rename to src/laybasic/laybasic/LayoutViewConfigPage6a.ui diff --git a/src/laybasic/LayoutViewConfigPage7.ui b/src/laybasic/laybasic/LayoutViewConfigPage7.ui similarity index 100% rename from src/laybasic/LayoutViewConfigPage7.ui rename to src/laybasic/laybasic/LayoutViewConfigPage7.ui diff --git a/src/laybasic/LibraryCellSelectionForm.ui b/src/laybasic/laybasic/LibraryCellSelectionForm.ui similarity index 100% rename from src/laybasic/LibraryCellSelectionForm.ui rename to src/laybasic/laybasic/LibraryCellSelectionForm.ui diff --git a/src/laybasic/LoadLayoutOptionsDialog.ui b/src/laybasic/laybasic/LoadLayoutOptionsDialog.ui similarity index 100% rename from src/laybasic/LoadLayoutOptionsDialog.ui rename to src/laybasic/laybasic/LoadLayoutOptionsDialog.ui diff --git a/src/laybasic/MarkerBrowserConfigPage.ui b/src/laybasic/laybasic/MarkerBrowserConfigPage.ui similarity index 100% rename from src/laybasic/MarkerBrowserConfigPage.ui rename to src/laybasic/laybasic/MarkerBrowserConfigPage.ui diff --git a/src/laybasic/MarkerBrowserConfigPage2.ui b/src/laybasic/laybasic/MarkerBrowserConfigPage2.ui similarity index 100% rename from src/laybasic/MarkerBrowserConfigPage2.ui rename to src/laybasic/laybasic/MarkerBrowserConfigPage2.ui diff --git a/src/laybasic/MarkerBrowserDialog.ui b/src/laybasic/laybasic/MarkerBrowserDialog.ui similarity index 100% rename from src/laybasic/MarkerBrowserDialog.ui rename to src/laybasic/laybasic/MarkerBrowserDialog.ui diff --git a/src/laybasic/MarkerBrowserPage.ui b/src/laybasic/laybasic/MarkerBrowserPage.ui similarity index 100% rename from src/laybasic/MarkerBrowserPage.ui rename to src/laybasic/laybasic/MarkerBrowserPage.ui diff --git a/src/laybasic/MarkerBrowserSnapshotView.ui b/src/laybasic/laybasic/MarkerBrowserSnapshotView.ui similarity index 100% rename from src/laybasic/MarkerBrowserSnapshotView.ui rename to src/laybasic/laybasic/MarkerBrowserSnapshotView.ui diff --git a/src/laybasic/MoveOptionsDialog.ui b/src/laybasic/laybasic/MoveOptionsDialog.ui similarity index 100% rename from src/laybasic/MoveOptionsDialog.ui rename to src/laybasic/laybasic/MoveOptionsDialog.ui diff --git a/src/laybasic/MoveToOptionsDialog.ui b/src/laybasic/laybasic/MoveToOptionsDialog.ui similarity index 100% rename from src/laybasic/MoveToOptionsDialog.ui rename to src/laybasic/laybasic/MoveToOptionsDialog.ui diff --git a/src/laybasic/NewCellPropertiesDialog.ui b/src/laybasic/laybasic/NewCellPropertiesDialog.ui similarity index 100% rename from src/laybasic/NewCellPropertiesDialog.ui rename to src/laybasic/laybasic/NewCellPropertiesDialog.ui diff --git a/src/laybasic/NewLayerPropertiesDialog.ui b/src/laybasic/laybasic/NewLayerPropertiesDialog.ui similarity index 100% rename from src/laybasic/NewLayerPropertiesDialog.ui rename to src/laybasic/laybasic/NewLayerPropertiesDialog.ui diff --git a/src/laybasic/NewLayoutPropertiesDialog.ui b/src/laybasic/laybasic/NewLayoutPropertiesDialog.ui similarity index 100% rename from src/laybasic/NewLayoutPropertiesDialog.ui rename to src/laybasic/laybasic/NewLayoutPropertiesDialog.ui diff --git a/src/laybasic/OASISWriterOptionPage.ui b/src/laybasic/laybasic/OASISWriterOptionPage.ui similarity index 100% rename from src/laybasic/OASISWriterOptionPage.ui rename to src/laybasic/laybasic/OASISWriterOptionPage.ui diff --git a/src/laybasic/OpenLayoutModeDialog.ui b/src/laybasic/laybasic/OpenLayoutModeDialog.ui similarity index 100% rename from src/laybasic/OpenLayoutModeDialog.ui rename to src/laybasic/laybasic/OpenLayoutModeDialog.ui diff --git a/src/laybasic/PropertiesDialog.ui b/src/laybasic/laybasic/PropertiesDialog.ui similarity index 100% rename from src/laybasic/PropertiesDialog.ui rename to src/laybasic/laybasic/PropertiesDialog.ui diff --git a/src/laybasic/RenameCellDialog.ui b/src/laybasic/laybasic/RenameCellDialog.ui similarity index 100% rename from src/laybasic/RenameCellDialog.ui rename to src/laybasic/laybasic/RenameCellDialog.ui diff --git a/src/laybasic/ReplaceCellOptionsDialog.ui b/src/laybasic/laybasic/ReplaceCellOptionsDialog.ui similarity index 100% rename from src/laybasic/ReplaceCellOptionsDialog.ui rename to src/laybasic/laybasic/ReplaceCellOptionsDialog.ui diff --git a/src/laybasic/SaveLayoutAsOptionsDialog.ui b/src/laybasic/laybasic/SaveLayoutAsOptionsDialog.ui similarity index 100% rename from src/laybasic/SaveLayoutAsOptionsDialog.ui rename to src/laybasic/laybasic/SaveLayoutAsOptionsDialog.ui diff --git a/src/laybasic/SaveLayoutOptionsDialog.ui b/src/laybasic/laybasic/SaveLayoutOptionsDialog.ui similarity index 100% rename from src/laybasic/SaveLayoutOptionsDialog.ui rename to src/laybasic/laybasic/SaveLayoutOptionsDialog.ui diff --git a/src/laybasic/SelectLineStyleForm.ui b/src/laybasic/laybasic/SelectLineStyleForm.ui similarity index 100% rename from src/laybasic/SelectLineStyleForm.ui rename to src/laybasic/laybasic/SelectLineStyleForm.ui diff --git a/src/laybasic/SelectStippleForm.ui b/src/laybasic/laybasic/SelectStippleForm.ui similarity index 100% rename from src/laybasic/SelectStippleForm.ui rename to src/laybasic/laybasic/SelectStippleForm.ui diff --git a/src/laybasic/SpecificLoadLayoutOptionsDialog.ui b/src/laybasic/laybasic/SpecificLoadLayoutOptionsDialog.ui similarity index 100% rename from src/laybasic/SpecificLoadLayoutOptionsDialog.ui rename to src/laybasic/laybasic/SpecificLoadLayoutOptionsDialog.ui diff --git a/src/laybasic/TipDialog.ui b/src/laybasic/laybasic/TipDialog.ui similarity index 100% rename from src/laybasic/TipDialog.ui rename to src/laybasic/laybasic/TipDialog.ui diff --git a/src/laybasic/UserPropertiesEditForm.ui b/src/laybasic/laybasic/UserPropertiesEditForm.ui similarity index 100% rename from src/laybasic/UserPropertiesEditForm.ui rename to src/laybasic/laybasic/UserPropertiesEditForm.ui diff --git a/src/laybasic/UserPropertiesForm.ui b/src/laybasic/laybasic/UserPropertiesForm.ui similarity index 100% rename from src/laybasic/UserPropertiesForm.ui rename to src/laybasic/laybasic/UserPropertiesForm.ui diff --git a/src/laybasic/fixedFont.h b/src/laybasic/laybasic/fixedFont.h similarity index 100% rename from src/laybasic/fixedFont.h rename to src/laybasic/laybasic/fixedFont.h diff --git a/src/laybasic/gsiDeclLayDialogs.cc b/src/laybasic/laybasic/gsiDeclLayDialogs.cc similarity index 100% rename from src/laybasic/gsiDeclLayDialogs.cc rename to src/laybasic/laybasic/gsiDeclLayDialogs.cc diff --git a/src/laybasic/gsiDeclLayLayers.cc b/src/laybasic/laybasic/gsiDeclLayLayers.cc similarity index 100% rename from src/laybasic/gsiDeclLayLayers.cc rename to src/laybasic/laybasic/gsiDeclLayLayers.cc diff --git a/src/laybasic/gsiDeclLayLayoutView.cc b/src/laybasic/laybasic/gsiDeclLayLayoutView.cc similarity index 100% rename from src/laybasic/gsiDeclLayLayoutView.cc rename to src/laybasic/laybasic/gsiDeclLayLayoutView.cc diff --git a/src/laybasic/gsiDeclLayMarker.cc b/src/laybasic/laybasic/gsiDeclLayMarker.cc similarity index 100% rename from src/laybasic/gsiDeclLayMarker.cc rename to src/laybasic/laybasic/gsiDeclLayMarker.cc diff --git a/src/laybasic/gsiDeclLayMenu.cc b/src/laybasic/laybasic/gsiDeclLayMenu.cc similarity index 100% rename from src/laybasic/gsiDeclLayMenu.cc rename to src/laybasic/laybasic/gsiDeclLayMenu.cc diff --git a/src/laybasic/gsiDeclLayPlugin.cc b/src/laybasic/laybasic/gsiDeclLayPlugin.cc similarity index 100% rename from src/laybasic/gsiDeclLayPlugin.cc rename to src/laybasic/laybasic/gsiDeclLayPlugin.cc diff --git a/src/laybasic/gsiDeclLayStream.cc b/src/laybasic/laybasic/gsiDeclLayStream.cc similarity index 100% rename from src/laybasic/gsiDeclLayStream.cc rename to src/laybasic/laybasic/gsiDeclLayStream.cc diff --git a/src/laybasic/gsiDeclLayTechnologies.cc b/src/laybasic/laybasic/gsiDeclLayTechnologies.cc similarity index 100% rename from src/laybasic/gsiDeclLayTechnologies.cc rename to src/laybasic/laybasic/gsiDeclLayTechnologies.cc diff --git a/src/laybasic/gtf.cc b/src/laybasic/laybasic/gtf.cc similarity index 100% rename from src/laybasic/gtf.cc rename to src/laybasic/laybasic/gtf.cc diff --git a/src/laybasic/gtf.h b/src/laybasic/laybasic/gtf.h similarity index 100% rename from src/laybasic/gtf.h rename to src/laybasic/laybasic/gtf.h diff --git a/src/laybasic/gtfdummy.cc b/src/laybasic/laybasic/gtfdummy.cc similarity index 100% rename from src/laybasic/gtfdummy.cc rename to src/laybasic/laybasic/gtfdummy.cc diff --git a/src/laybasic/layAbstractMenu.cc b/src/laybasic/laybasic/layAbstractMenu.cc similarity index 100% rename from src/laybasic/layAbstractMenu.cc rename to src/laybasic/laybasic/layAbstractMenu.cc diff --git a/src/laybasic/layAbstractMenu.h b/src/laybasic/laybasic/layAbstractMenu.h similarity index 100% rename from src/laybasic/layAbstractMenu.h rename to src/laybasic/laybasic/layAbstractMenu.h diff --git a/src/laybasic/layAbstractMenuProvider.cc b/src/laybasic/laybasic/layAbstractMenuProvider.cc similarity index 100% rename from src/laybasic/layAbstractMenuProvider.cc rename to src/laybasic/laybasic/layAbstractMenuProvider.cc diff --git a/src/laybasic/layAbstractMenuProvider.h b/src/laybasic/laybasic/layAbstractMenuProvider.h similarity index 100% rename from src/laybasic/layAbstractMenuProvider.h rename to src/laybasic/laybasic/layAbstractMenuProvider.h diff --git a/src/laybasic/layAnnotationShapes.cc b/src/laybasic/laybasic/layAnnotationShapes.cc similarity index 100% rename from src/laybasic/layAnnotationShapes.cc rename to src/laybasic/laybasic/layAnnotationShapes.cc diff --git a/src/laybasic/layAnnotationShapes.h b/src/laybasic/laybasic/layAnnotationShapes.h similarity index 100% rename from src/laybasic/layAnnotationShapes.h rename to src/laybasic/laybasic/layAnnotationShapes.h diff --git a/src/laybasic/layBackgroundAwareTreeStyle.cc b/src/laybasic/laybasic/layBackgroundAwareTreeStyle.cc similarity index 100% rename from src/laybasic/layBackgroundAwareTreeStyle.cc rename to src/laybasic/laybasic/layBackgroundAwareTreeStyle.cc diff --git a/src/laybasic/layBackgroundAwareTreeStyle.h b/src/laybasic/laybasic/layBackgroundAwareTreeStyle.h similarity index 100% rename from src/laybasic/layBackgroundAwareTreeStyle.h rename to src/laybasic/laybasic/layBackgroundAwareTreeStyle.h diff --git a/src/laybasic/layBitmap.cc b/src/laybasic/laybasic/layBitmap.cc similarity index 100% rename from src/laybasic/layBitmap.cc rename to src/laybasic/laybasic/layBitmap.cc diff --git a/src/laybasic/layBitmap.h b/src/laybasic/laybasic/layBitmap.h similarity index 100% rename from src/laybasic/layBitmap.h rename to src/laybasic/laybasic/layBitmap.h diff --git a/src/laybasic/layBitmapRenderer.cc b/src/laybasic/laybasic/layBitmapRenderer.cc similarity index 100% rename from src/laybasic/layBitmapRenderer.cc rename to src/laybasic/laybasic/layBitmapRenderer.cc diff --git a/src/laybasic/layBitmapRenderer.h b/src/laybasic/laybasic/layBitmapRenderer.h similarity index 100% rename from src/laybasic/layBitmapRenderer.h rename to src/laybasic/laybasic/layBitmapRenderer.h diff --git a/src/laybasic/layBitmapsToImage.cc b/src/laybasic/laybasic/layBitmapsToImage.cc similarity index 100% rename from src/laybasic/layBitmapsToImage.cc rename to src/laybasic/laybasic/layBitmapsToImage.cc diff --git a/src/laybasic/layBitmapsToImage.h b/src/laybasic/laybasic/layBitmapsToImage.h similarity index 100% rename from src/laybasic/layBitmapsToImage.h rename to src/laybasic/laybasic/layBitmapsToImage.h diff --git a/src/laybasic/layBookmarkList.cc b/src/laybasic/laybasic/layBookmarkList.cc similarity index 100% rename from src/laybasic/layBookmarkList.cc rename to src/laybasic/laybasic/layBookmarkList.cc diff --git a/src/laybasic/layBookmarkList.h b/src/laybasic/laybasic/layBookmarkList.h similarity index 100% rename from src/laybasic/layBookmarkList.h rename to src/laybasic/laybasic/layBookmarkList.h diff --git a/src/laybasic/layBookmarkManagementForm.cc b/src/laybasic/laybasic/layBookmarkManagementForm.cc similarity index 100% rename from src/laybasic/layBookmarkManagementForm.cc rename to src/laybasic/laybasic/layBookmarkManagementForm.cc diff --git a/src/laybasic/layBookmarkManagementForm.h b/src/laybasic/laybasic/layBookmarkManagementForm.h similarity index 100% rename from src/laybasic/layBookmarkManagementForm.h rename to src/laybasic/laybasic/layBookmarkManagementForm.h diff --git a/src/laybasic/layBrowseInstancesForm.cc b/src/laybasic/laybasic/layBrowseInstancesForm.cc similarity index 100% rename from src/laybasic/layBrowseInstancesForm.cc rename to src/laybasic/laybasic/layBrowseInstancesForm.cc diff --git a/src/laybasic/layBrowseInstancesForm.h b/src/laybasic/laybasic/layBrowseInstancesForm.h similarity index 100% rename from src/laybasic/layBrowseInstancesForm.h rename to src/laybasic/laybasic/layBrowseInstancesForm.h diff --git a/src/laybasic/layBrowseShapesForm.cc b/src/laybasic/laybasic/layBrowseShapesForm.cc similarity index 100% rename from src/laybasic/layBrowseShapesForm.cc rename to src/laybasic/laybasic/layBrowseShapesForm.cc diff --git a/src/laybasic/layBrowseShapesForm.h b/src/laybasic/laybasic/layBrowseShapesForm.h similarity index 100% rename from src/laybasic/layBrowseShapesForm.h rename to src/laybasic/laybasic/layBrowseShapesForm.h diff --git a/src/laybasic/layBrowser.cc b/src/laybasic/laybasic/layBrowser.cc similarity index 100% rename from src/laybasic/layBrowser.cc rename to src/laybasic/laybasic/layBrowser.cc diff --git a/src/laybasic/layBrowser.h b/src/laybasic/laybasic/layBrowser.h similarity index 100% rename from src/laybasic/layBrowser.h rename to src/laybasic/laybasic/layBrowser.h diff --git a/src/laybasic/layBrowserDialog.cc b/src/laybasic/laybasic/layBrowserDialog.cc similarity index 100% rename from src/laybasic/layBrowserDialog.cc rename to src/laybasic/laybasic/layBrowserDialog.cc diff --git a/src/laybasic/layBrowserDialog.h b/src/laybasic/laybasic/layBrowserDialog.h similarity index 100% rename from src/laybasic/layBrowserDialog.h rename to src/laybasic/laybasic/layBrowserDialog.h diff --git a/src/laybasic/layBrowserPanel.cc b/src/laybasic/laybasic/layBrowserPanel.cc similarity index 100% rename from src/laybasic/layBrowserPanel.cc rename to src/laybasic/laybasic/layBrowserPanel.cc diff --git a/src/laybasic/layBrowserPanel.h b/src/laybasic/laybasic/layBrowserPanel.h similarity index 100% rename from src/laybasic/layBrowserPanel.h rename to src/laybasic/laybasic/layBrowserPanel.h diff --git a/src/laybasic/layCIFReaderPlugin.cc b/src/laybasic/laybasic/layCIFReaderPlugin.cc similarity index 100% rename from src/laybasic/layCIFReaderPlugin.cc rename to src/laybasic/laybasic/layCIFReaderPlugin.cc diff --git a/src/laybasic/layCIFReaderPlugin.h b/src/laybasic/laybasic/layCIFReaderPlugin.h similarity index 100% rename from src/laybasic/layCIFReaderPlugin.h rename to src/laybasic/laybasic/layCIFReaderPlugin.h diff --git a/src/laybasic/layCIFWriterPlugin.cc b/src/laybasic/laybasic/layCIFWriterPlugin.cc similarity index 100% rename from src/laybasic/layCIFWriterPlugin.cc rename to src/laybasic/laybasic/layCIFWriterPlugin.cc diff --git a/src/laybasic/layCIFWriterPlugin.h b/src/laybasic/laybasic/layCIFWriterPlugin.h similarity index 100% rename from src/laybasic/layCIFWriterPlugin.h rename to src/laybasic/laybasic/layCIFWriterPlugin.h diff --git a/src/laybasic/layCanvasPlane.cc b/src/laybasic/laybasic/layCanvasPlane.cc similarity index 100% rename from src/laybasic/layCanvasPlane.cc rename to src/laybasic/laybasic/layCanvasPlane.cc diff --git a/src/laybasic/layCanvasPlane.h b/src/laybasic/laybasic/layCanvasPlane.h similarity index 100% rename from src/laybasic/layCanvasPlane.h rename to src/laybasic/laybasic/layCanvasPlane.h diff --git a/src/laybasic/layCellSelectionForm.cc b/src/laybasic/laybasic/layCellSelectionForm.cc similarity index 100% rename from src/laybasic/layCellSelectionForm.cc rename to src/laybasic/laybasic/layCellSelectionForm.cc diff --git a/src/laybasic/layCellSelectionForm.h b/src/laybasic/laybasic/layCellSelectionForm.h similarity index 100% rename from src/laybasic/layCellSelectionForm.h rename to src/laybasic/laybasic/layCellSelectionForm.h diff --git a/src/laybasic/layCellTreeModel.cc b/src/laybasic/laybasic/layCellTreeModel.cc similarity index 100% rename from src/laybasic/layCellTreeModel.cc rename to src/laybasic/laybasic/layCellTreeModel.cc diff --git a/src/laybasic/layCellTreeModel.h b/src/laybasic/laybasic/layCellTreeModel.h similarity index 100% rename from src/laybasic/layCellTreeModel.h rename to src/laybasic/laybasic/layCellTreeModel.h diff --git a/src/laybasic/layCellView.cc b/src/laybasic/laybasic/layCellView.cc similarity index 100% rename from src/laybasic/layCellView.cc rename to src/laybasic/laybasic/layCellView.cc diff --git a/src/laybasic/layCellView.h b/src/laybasic/laybasic/layCellView.h similarity index 100% rename from src/laybasic/layCellView.h rename to src/laybasic/laybasic/layCellView.h diff --git a/src/laybasic/layColorPalette.cc b/src/laybasic/laybasic/layColorPalette.cc similarity index 100% rename from src/laybasic/layColorPalette.cc rename to src/laybasic/laybasic/layColorPalette.cc diff --git a/src/laybasic/layColorPalette.h b/src/laybasic/laybasic/layColorPalette.h similarity index 100% rename from src/laybasic/layColorPalette.h rename to src/laybasic/laybasic/layColorPalette.h diff --git a/src/laybasic/layCommonReaderPlugin.cc b/src/laybasic/laybasic/layCommonReaderPlugin.cc similarity index 100% rename from src/laybasic/layCommonReaderPlugin.cc rename to src/laybasic/laybasic/layCommonReaderPlugin.cc diff --git a/src/laybasic/layCommonReaderPlugin.h b/src/laybasic/laybasic/layCommonReaderPlugin.h similarity index 100% rename from src/laybasic/layCommonReaderPlugin.h rename to src/laybasic/laybasic/layCommonReaderPlugin.h diff --git a/src/laybasic/layConfigurationDialog.cc b/src/laybasic/laybasic/layConfigurationDialog.cc similarity index 100% rename from src/laybasic/layConfigurationDialog.cc rename to src/laybasic/laybasic/layConfigurationDialog.cc diff --git a/src/laybasic/layConfigurationDialog.h b/src/laybasic/laybasic/layConfigurationDialog.h similarity index 100% rename from src/laybasic/layConfigurationDialog.h rename to src/laybasic/laybasic/layConfigurationDialog.h diff --git a/src/laybasic/layConverters.cc b/src/laybasic/laybasic/layConverters.cc similarity index 100% rename from src/laybasic/layConverters.cc rename to src/laybasic/laybasic/layConverters.cc diff --git a/src/laybasic/layConverters.h b/src/laybasic/laybasic/layConverters.h similarity index 100% rename from src/laybasic/layConverters.h rename to src/laybasic/laybasic/layConverters.h diff --git a/src/laybasic/layCursor.cc b/src/laybasic/laybasic/layCursor.cc similarity index 100% rename from src/laybasic/layCursor.cc rename to src/laybasic/laybasic/layCursor.cc diff --git a/src/laybasic/layCursor.h b/src/laybasic/laybasic/layCursor.h similarity index 100% rename from src/laybasic/layCursor.h rename to src/laybasic/laybasic/layCursor.h diff --git a/src/laybasic/layDXFReaderPlugin.cc b/src/laybasic/laybasic/layDXFReaderPlugin.cc similarity index 100% rename from src/laybasic/layDXFReaderPlugin.cc rename to src/laybasic/laybasic/layDXFReaderPlugin.cc diff --git a/src/laybasic/layDXFReaderPlugin.h b/src/laybasic/laybasic/layDXFReaderPlugin.h similarity index 100% rename from src/laybasic/layDXFReaderPlugin.h rename to src/laybasic/laybasic/layDXFReaderPlugin.h diff --git a/src/laybasic/layDXFWriterPlugin.cc b/src/laybasic/laybasic/layDXFWriterPlugin.cc similarity index 100% rename from src/laybasic/layDXFWriterPlugin.cc rename to src/laybasic/laybasic/layDXFWriterPlugin.cc diff --git a/src/laybasic/layDXFWriterPlugin.h b/src/laybasic/laybasic/layDXFWriterPlugin.h similarity index 100% rename from src/laybasic/layDXFWriterPlugin.h rename to src/laybasic/laybasic/layDXFWriterPlugin.h diff --git a/src/laybasic/layDialogs.cc b/src/laybasic/laybasic/layDialogs.cc similarity index 100% rename from src/laybasic/layDialogs.cc rename to src/laybasic/laybasic/layDialogs.cc diff --git a/src/laybasic/layDialogs.h b/src/laybasic/laybasic/layDialogs.h similarity index 100% rename from src/laybasic/layDialogs.h rename to src/laybasic/laybasic/layDialogs.h diff --git a/src/laybasic/layDisplayState.cc b/src/laybasic/laybasic/layDisplayState.cc similarity index 100% rename from src/laybasic/layDisplayState.cc rename to src/laybasic/laybasic/layDisplayState.cc diff --git a/src/laybasic/layDisplayState.h b/src/laybasic/laybasic/layDisplayState.h similarity index 100% rename from src/laybasic/layDisplayState.h rename to src/laybasic/laybasic/layDisplayState.h diff --git a/src/laybasic/layDitherPattern.cc b/src/laybasic/laybasic/layDitherPattern.cc similarity index 100% rename from src/laybasic/layDitherPattern.cc rename to src/laybasic/laybasic/layDitherPattern.cc diff --git a/src/laybasic/layDitherPattern.h b/src/laybasic/laybasic/layDitherPattern.h similarity index 100% rename from src/laybasic/layDitherPattern.h rename to src/laybasic/laybasic/layDitherPattern.h diff --git a/src/laybasic/layDrawing.cc b/src/laybasic/laybasic/layDrawing.cc similarity index 100% rename from src/laybasic/layDrawing.cc rename to src/laybasic/laybasic/layDrawing.cc diff --git a/src/laybasic/layDrawing.h b/src/laybasic/laybasic/layDrawing.h similarity index 100% rename from src/laybasic/layDrawing.h rename to src/laybasic/laybasic/layDrawing.h diff --git a/src/laybasic/layEditLineStyleWidget.cc b/src/laybasic/laybasic/layEditLineStyleWidget.cc similarity index 100% rename from src/laybasic/layEditLineStyleWidget.cc rename to src/laybasic/laybasic/layEditLineStyleWidget.cc diff --git a/src/laybasic/layEditLineStyleWidget.h b/src/laybasic/laybasic/layEditLineStyleWidget.h similarity index 100% rename from src/laybasic/layEditLineStyleWidget.h rename to src/laybasic/laybasic/layEditLineStyleWidget.h diff --git a/src/laybasic/layEditLineStylesForm.cc b/src/laybasic/laybasic/layEditLineStylesForm.cc similarity index 100% rename from src/laybasic/layEditLineStylesForm.cc rename to src/laybasic/laybasic/layEditLineStylesForm.cc diff --git a/src/laybasic/layEditLineStylesForm.h b/src/laybasic/laybasic/layEditLineStylesForm.h similarity index 100% rename from src/laybasic/layEditLineStylesForm.h rename to src/laybasic/laybasic/layEditLineStylesForm.h diff --git a/src/laybasic/layEditStippleWidget.cc b/src/laybasic/laybasic/layEditStippleWidget.cc similarity index 100% rename from src/laybasic/layEditStippleWidget.cc rename to src/laybasic/laybasic/layEditStippleWidget.cc diff --git a/src/laybasic/layEditStippleWidget.h b/src/laybasic/laybasic/layEditStippleWidget.h similarity index 100% rename from src/laybasic/layEditStippleWidget.h rename to src/laybasic/laybasic/layEditStippleWidget.h diff --git a/src/laybasic/layEditStipplesForm.cc b/src/laybasic/laybasic/layEditStipplesForm.cc similarity index 100% rename from src/laybasic/layEditStipplesForm.cc rename to src/laybasic/laybasic/layEditStipplesForm.cc diff --git a/src/laybasic/layEditStipplesForm.h b/src/laybasic/laybasic/layEditStipplesForm.h similarity index 100% rename from src/laybasic/layEditStipplesForm.h rename to src/laybasic/laybasic/layEditStipplesForm.h diff --git a/src/laybasic/layEditable.cc b/src/laybasic/laybasic/layEditable.cc similarity index 100% rename from src/laybasic/layEditable.cc rename to src/laybasic/laybasic/layEditable.cc diff --git a/src/laybasic/layEditable.h b/src/laybasic/laybasic/layEditable.h similarity index 100% rename from src/laybasic/layEditable.h rename to src/laybasic/laybasic/layEditable.h diff --git a/src/laybasic/layFileDialog.cc b/src/laybasic/laybasic/layFileDialog.cc similarity index 100% rename from src/laybasic/layFileDialog.cc rename to src/laybasic/laybasic/layFileDialog.cc diff --git a/src/laybasic/layFileDialog.h b/src/laybasic/laybasic/layFileDialog.h similarity index 100% rename from src/laybasic/layFileDialog.h rename to src/laybasic/laybasic/layFileDialog.h diff --git a/src/laybasic/layFinder.cc b/src/laybasic/laybasic/layFinder.cc similarity index 100% rename from src/laybasic/layFinder.cc rename to src/laybasic/laybasic/layFinder.cc diff --git a/src/laybasic/layFinder.h b/src/laybasic/laybasic/layFinder.h similarity index 100% rename from src/laybasic/layFinder.h rename to src/laybasic/laybasic/layFinder.h diff --git a/src/laybasic/layFixedFont.cc b/src/laybasic/laybasic/layFixedFont.cc similarity index 100% rename from src/laybasic/layFixedFont.cc rename to src/laybasic/laybasic/layFixedFont.cc diff --git a/src/laybasic/layFixedFont.h b/src/laybasic/laybasic/layFixedFont.h similarity index 100% rename from src/laybasic/layFixedFont.h rename to src/laybasic/laybasic/layFixedFont.h diff --git a/src/laybasic/layGDS2ReaderPlugin.cc b/src/laybasic/laybasic/layGDS2ReaderPlugin.cc similarity index 100% rename from src/laybasic/layGDS2ReaderPlugin.cc rename to src/laybasic/laybasic/layGDS2ReaderPlugin.cc diff --git a/src/laybasic/layGDS2ReaderPlugin.h b/src/laybasic/laybasic/layGDS2ReaderPlugin.h similarity index 100% rename from src/laybasic/layGDS2ReaderPlugin.h rename to src/laybasic/laybasic/layGDS2ReaderPlugin.h diff --git a/src/laybasic/layGDS2WriterPlugin.cc b/src/laybasic/laybasic/layGDS2WriterPlugin.cc similarity index 100% rename from src/laybasic/layGDS2WriterPlugin.cc rename to src/laybasic/laybasic/layGDS2WriterPlugin.cc diff --git a/src/laybasic/layGDS2WriterPlugin.h b/src/laybasic/laybasic/layGDS2WriterPlugin.h similarity index 100% rename from src/laybasic/layGDS2WriterPlugin.h rename to src/laybasic/laybasic/layGDS2WriterPlugin.h diff --git a/src/laybasic/layGridNet.cc b/src/laybasic/laybasic/layGridNet.cc similarity index 100% rename from src/laybasic/layGridNet.cc rename to src/laybasic/laybasic/layGridNet.cc diff --git a/src/laybasic/layGridNet.h b/src/laybasic/laybasic/layGridNet.h similarity index 100% rename from src/laybasic/layGridNet.h rename to src/laybasic/laybasic/layGridNet.h diff --git a/src/laybasic/layHierarchyControlPanel.cc b/src/laybasic/laybasic/layHierarchyControlPanel.cc similarity index 100% rename from src/laybasic/layHierarchyControlPanel.cc rename to src/laybasic/laybasic/layHierarchyControlPanel.cc diff --git a/src/laybasic/layHierarchyControlPanel.h b/src/laybasic/laybasic/layHierarchyControlPanel.h similarity index 100% rename from src/laybasic/layHierarchyControlPanel.h rename to src/laybasic/laybasic/layHierarchyControlPanel.h diff --git a/src/laybasic/layLayerControlPanel.cc b/src/laybasic/laybasic/layLayerControlPanel.cc similarity index 100% rename from src/laybasic/layLayerControlPanel.cc rename to src/laybasic/laybasic/layLayerControlPanel.cc diff --git a/src/laybasic/layLayerControlPanel.h b/src/laybasic/laybasic/layLayerControlPanel.h similarity index 100% rename from src/laybasic/layLayerControlPanel.h rename to src/laybasic/laybasic/layLayerControlPanel.h diff --git a/src/laybasic/layLayerMappingWidget.cc b/src/laybasic/laybasic/layLayerMappingWidget.cc similarity index 100% rename from src/laybasic/layLayerMappingWidget.cc rename to src/laybasic/laybasic/layLayerMappingWidget.cc diff --git a/src/laybasic/layLayerMappingWidget.h b/src/laybasic/laybasic/layLayerMappingWidget.h similarity index 100% rename from src/laybasic/layLayerMappingWidget.h rename to src/laybasic/laybasic/layLayerMappingWidget.h diff --git a/src/laybasic/layLayerProperties.cc b/src/laybasic/laybasic/layLayerProperties.cc similarity index 100% rename from src/laybasic/layLayerProperties.cc rename to src/laybasic/laybasic/layLayerProperties.cc diff --git a/src/laybasic/layLayerProperties.h b/src/laybasic/laybasic/layLayerProperties.h similarity index 100% rename from src/laybasic/layLayerProperties.h rename to src/laybasic/laybasic/layLayerProperties.h diff --git a/src/laybasic/layLayerToolbox.cc b/src/laybasic/laybasic/layLayerToolbox.cc similarity index 100% rename from src/laybasic/layLayerToolbox.cc rename to src/laybasic/laybasic/layLayerToolbox.cc diff --git a/src/laybasic/layLayerToolbox.h b/src/laybasic/laybasic/layLayerToolbox.h similarity index 100% rename from src/laybasic/layLayerToolbox.h rename to src/laybasic/laybasic/layLayerToolbox.h diff --git a/src/laybasic/layLayerTreeModel.cc b/src/laybasic/laybasic/layLayerTreeModel.cc similarity index 100% rename from src/laybasic/layLayerTreeModel.cc rename to src/laybasic/laybasic/layLayerTreeModel.cc diff --git a/src/laybasic/layLayerTreeModel.h b/src/laybasic/laybasic/layLayerTreeModel.h similarity index 100% rename from src/laybasic/layLayerTreeModel.h rename to src/laybasic/laybasic/layLayerTreeModel.h diff --git a/src/laybasic/layLayoutCanvas.cc b/src/laybasic/laybasic/layLayoutCanvas.cc similarity index 100% rename from src/laybasic/layLayoutCanvas.cc rename to src/laybasic/laybasic/layLayoutCanvas.cc diff --git a/src/laybasic/layLayoutCanvas.h b/src/laybasic/laybasic/layLayoutCanvas.h similarity index 100% rename from src/laybasic/layLayoutCanvas.h rename to src/laybasic/laybasic/layLayoutCanvas.h diff --git a/src/laybasic/layLayoutPropertiesForm.cc b/src/laybasic/laybasic/layLayoutPropertiesForm.cc similarity index 100% rename from src/laybasic/layLayoutPropertiesForm.cc rename to src/laybasic/laybasic/layLayoutPropertiesForm.cc diff --git a/src/laybasic/layLayoutPropertiesForm.h b/src/laybasic/laybasic/layLayoutPropertiesForm.h similarity index 100% rename from src/laybasic/layLayoutPropertiesForm.h rename to src/laybasic/laybasic/layLayoutPropertiesForm.h diff --git a/src/laybasic/layLayoutView.cc b/src/laybasic/laybasic/layLayoutView.cc similarity index 100% rename from src/laybasic/layLayoutView.cc rename to src/laybasic/laybasic/layLayoutView.cc diff --git a/src/laybasic/layLayoutView.h b/src/laybasic/laybasic/layLayoutView.h similarity index 100% rename from src/laybasic/layLayoutView.h rename to src/laybasic/laybasic/layLayoutView.h diff --git a/src/laybasic/layLayoutViewConfigPages.cc b/src/laybasic/laybasic/layLayoutViewConfigPages.cc similarity index 100% rename from src/laybasic/layLayoutViewConfigPages.cc rename to src/laybasic/laybasic/layLayoutViewConfigPages.cc diff --git a/src/laybasic/layLayoutViewConfigPages.h b/src/laybasic/laybasic/layLayoutViewConfigPages.h similarity index 100% rename from src/laybasic/layLayoutViewConfigPages.h rename to src/laybasic/laybasic/layLayoutViewConfigPages.h diff --git a/src/laybasic/layLineStylePalette.cc b/src/laybasic/laybasic/layLineStylePalette.cc similarity index 100% rename from src/laybasic/layLineStylePalette.cc rename to src/laybasic/laybasic/layLineStylePalette.cc diff --git a/src/laybasic/layLineStylePalette.h b/src/laybasic/laybasic/layLineStylePalette.h similarity index 100% rename from src/laybasic/layLineStylePalette.h rename to src/laybasic/laybasic/layLineStylePalette.h diff --git a/src/laybasic/layLineStyles.cc b/src/laybasic/laybasic/layLineStyles.cc similarity index 100% rename from src/laybasic/layLineStyles.cc rename to src/laybasic/laybasic/layLineStyles.cc diff --git a/src/laybasic/layLineStyles.h b/src/laybasic/laybasic/layLineStyles.h similarity index 100% rename from src/laybasic/layLineStyles.h rename to src/laybasic/laybasic/layLineStyles.h diff --git a/src/laybasic/layLoadLayoutOptionsDialog.cc b/src/laybasic/laybasic/layLoadLayoutOptionsDialog.cc similarity index 100% rename from src/laybasic/layLoadLayoutOptionsDialog.cc rename to src/laybasic/laybasic/layLoadLayoutOptionsDialog.cc diff --git a/src/laybasic/layLoadLayoutOptionsDialog.h b/src/laybasic/laybasic/layLoadLayoutOptionsDialog.h similarity index 100% rename from src/laybasic/layLoadLayoutOptionsDialog.h rename to src/laybasic/laybasic/layLoadLayoutOptionsDialog.h diff --git a/src/laybasic/layMarker.cc b/src/laybasic/laybasic/layMarker.cc similarity index 100% rename from src/laybasic/layMarker.cc rename to src/laybasic/laybasic/layMarker.cc diff --git a/src/laybasic/layMarker.h b/src/laybasic/laybasic/layMarker.h similarity index 100% rename from src/laybasic/layMarker.h rename to src/laybasic/laybasic/layMarker.h diff --git a/src/laybasic/layMouseTracker.cc b/src/laybasic/laybasic/layMouseTracker.cc similarity index 100% rename from src/laybasic/layMouseTracker.cc rename to src/laybasic/laybasic/layMouseTracker.cc diff --git a/src/laybasic/layMouseTracker.h b/src/laybasic/laybasic/layMouseTracker.h similarity index 100% rename from src/laybasic/layMouseTracker.h rename to src/laybasic/laybasic/layMouseTracker.h diff --git a/src/laybasic/layMove.cc b/src/laybasic/laybasic/layMove.cc similarity index 100% rename from src/laybasic/layMove.cc rename to src/laybasic/laybasic/layMove.cc diff --git a/src/laybasic/layMove.h b/src/laybasic/laybasic/layMove.h similarity index 100% rename from src/laybasic/layMove.h rename to src/laybasic/laybasic/layMove.h diff --git a/src/laybasic/layOASISReaderPlugin.cc b/src/laybasic/laybasic/layOASISReaderPlugin.cc similarity index 100% rename from src/laybasic/layOASISReaderPlugin.cc rename to src/laybasic/laybasic/layOASISReaderPlugin.cc diff --git a/src/laybasic/layOASISReaderPlugin.h b/src/laybasic/laybasic/layOASISReaderPlugin.h similarity index 100% rename from src/laybasic/layOASISReaderPlugin.h rename to src/laybasic/laybasic/layOASISReaderPlugin.h diff --git a/src/laybasic/layOASISWriterPlugin.cc b/src/laybasic/laybasic/layOASISWriterPlugin.cc similarity index 100% rename from src/laybasic/layOASISWriterPlugin.cc rename to src/laybasic/laybasic/layOASISWriterPlugin.cc diff --git a/src/laybasic/layOASISWriterPlugin.h b/src/laybasic/laybasic/layOASISWriterPlugin.h similarity index 100% rename from src/laybasic/layOASISWriterPlugin.h rename to src/laybasic/laybasic/layOASISWriterPlugin.h diff --git a/src/laybasic/layObjectInstPath.cc b/src/laybasic/laybasic/layObjectInstPath.cc similarity index 100% rename from src/laybasic/layObjectInstPath.cc rename to src/laybasic/laybasic/layObjectInstPath.cc diff --git a/src/laybasic/layObjectInstPath.h b/src/laybasic/laybasic/layObjectInstPath.h similarity index 100% rename from src/laybasic/layObjectInstPath.h rename to src/laybasic/laybasic/layObjectInstPath.h diff --git a/src/laybasic/layParsedLayerSource.cc b/src/laybasic/laybasic/layParsedLayerSource.cc similarity index 100% rename from src/laybasic/layParsedLayerSource.cc rename to src/laybasic/laybasic/layParsedLayerSource.cc diff --git a/src/laybasic/layParsedLayerSource.h b/src/laybasic/laybasic/layParsedLayerSource.h similarity index 100% rename from src/laybasic/layParsedLayerSource.h rename to src/laybasic/laybasic/layParsedLayerSource.h diff --git a/src/laybasic/layPlugin.cc b/src/laybasic/laybasic/layPlugin.cc similarity index 100% rename from src/laybasic/layPlugin.cc rename to src/laybasic/laybasic/layPlugin.cc diff --git a/src/laybasic/layPlugin.h b/src/laybasic/laybasic/layPlugin.h similarity index 100% rename from src/laybasic/layPlugin.h rename to src/laybasic/laybasic/layPlugin.h diff --git a/src/laybasic/layProperties.cc b/src/laybasic/laybasic/layProperties.cc similarity index 100% rename from src/laybasic/layProperties.cc rename to src/laybasic/laybasic/layProperties.cc diff --git a/src/laybasic/layProperties.h b/src/laybasic/laybasic/layProperties.h similarity index 100% rename from src/laybasic/layProperties.h rename to src/laybasic/laybasic/layProperties.h diff --git a/src/laybasic/layPropertiesDialog.cc b/src/laybasic/laybasic/layPropertiesDialog.cc similarity index 100% rename from src/laybasic/layPropertiesDialog.cc rename to src/laybasic/laybasic/layPropertiesDialog.cc diff --git a/src/laybasic/layPropertiesDialog.h b/src/laybasic/laybasic/layPropertiesDialog.h similarity index 100% rename from src/laybasic/layPropertiesDialog.h rename to src/laybasic/laybasic/layPropertiesDialog.h diff --git a/src/laybasic/layQtTools.cc b/src/laybasic/laybasic/layQtTools.cc similarity index 100% rename from src/laybasic/layQtTools.cc rename to src/laybasic/laybasic/layQtTools.cc diff --git a/src/laybasic/layQtTools.h b/src/laybasic/laybasic/layQtTools.h similarity index 100% rename from src/laybasic/layQtTools.h rename to src/laybasic/laybasic/layQtTools.h diff --git a/src/laybasic/layRedrawLayerInfo.cc b/src/laybasic/laybasic/layRedrawLayerInfo.cc similarity index 100% rename from src/laybasic/layRedrawLayerInfo.cc rename to src/laybasic/laybasic/layRedrawLayerInfo.cc diff --git a/src/laybasic/layRedrawLayerInfo.h b/src/laybasic/laybasic/layRedrawLayerInfo.h similarity index 100% rename from src/laybasic/layRedrawLayerInfo.h rename to src/laybasic/laybasic/layRedrawLayerInfo.h diff --git a/src/laybasic/layRedrawThread.cc b/src/laybasic/laybasic/layRedrawThread.cc similarity index 100% rename from src/laybasic/layRedrawThread.cc rename to src/laybasic/laybasic/layRedrawThread.cc diff --git a/src/laybasic/layRedrawThread.h b/src/laybasic/laybasic/layRedrawThread.h similarity index 100% rename from src/laybasic/layRedrawThread.h rename to src/laybasic/laybasic/layRedrawThread.h diff --git a/src/laybasic/layRedrawThreadCanvas.cc b/src/laybasic/laybasic/layRedrawThreadCanvas.cc similarity index 100% rename from src/laybasic/layRedrawThreadCanvas.cc rename to src/laybasic/laybasic/layRedrawThreadCanvas.cc diff --git a/src/laybasic/layRedrawThreadCanvas.h b/src/laybasic/laybasic/layRedrawThreadCanvas.h similarity index 100% rename from src/laybasic/layRedrawThreadCanvas.h rename to src/laybasic/laybasic/layRedrawThreadCanvas.h diff --git a/src/laybasic/layRedrawThreadWorker.cc b/src/laybasic/laybasic/layRedrawThreadWorker.cc similarity index 100% rename from src/laybasic/layRedrawThreadWorker.cc rename to src/laybasic/laybasic/layRedrawThreadWorker.cc diff --git a/src/laybasic/layRedrawThreadWorker.h b/src/laybasic/laybasic/layRedrawThreadWorker.h similarity index 100% rename from src/laybasic/layRedrawThreadWorker.h rename to src/laybasic/laybasic/layRedrawThreadWorker.h diff --git a/src/laybasic/layRenderer.cc b/src/laybasic/laybasic/layRenderer.cc similarity index 100% rename from src/laybasic/layRenderer.cc rename to src/laybasic/laybasic/layRenderer.cc diff --git a/src/laybasic/layRenderer.h b/src/laybasic/laybasic/layRenderer.h similarity index 100% rename from src/laybasic/layRenderer.h rename to src/laybasic/laybasic/layRenderer.h diff --git a/src/laybasic/layRubberBox.cc b/src/laybasic/laybasic/layRubberBox.cc similarity index 100% rename from src/laybasic/layRubberBox.cc rename to src/laybasic/laybasic/layRubberBox.cc diff --git a/src/laybasic/layRubberBox.h b/src/laybasic/laybasic/layRubberBox.h similarity index 100% rename from src/laybasic/layRubberBox.h rename to src/laybasic/laybasic/layRubberBox.h diff --git a/src/laybasic/laySaveLayoutOptionsDialog.cc b/src/laybasic/laybasic/laySaveLayoutOptionsDialog.cc similarity index 100% rename from src/laybasic/laySaveLayoutOptionsDialog.cc rename to src/laybasic/laybasic/laySaveLayoutOptionsDialog.cc diff --git a/src/laybasic/laySaveLayoutOptionsDialog.h b/src/laybasic/laybasic/laySaveLayoutOptionsDialog.h similarity index 100% rename from src/laybasic/laySaveLayoutOptionsDialog.h rename to src/laybasic/laybasic/laySaveLayoutOptionsDialog.h diff --git a/src/laybasic/laySelectLineStyleForm.cc b/src/laybasic/laybasic/laySelectLineStyleForm.cc similarity index 100% rename from src/laybasic/laySelectLineStyleForm.cc rename to src/laybasic/laybasic/laySelectLineStyleForm.cc diff --git a/src/laybasic/laySelectLineStyleForm.h b/src/laybasic/laybasic/laySelectLineStyleForm.h similarity index 100% rename from src/laybasic/laySelectLineStyleForm.h rename to src/laybasic/laybasic/laySelectLineStyleForm.h diff --git a/src/laybasic/laySelectStippleForm.cc b/src/laybasic/laybasic/laySelectStippleForm.cc similarity index 100% rename from src/laybasic/laySelectStippleForm.cc rename to src/laybasic/laybasic/laySelectStippleForm.cc diff --git a/src/laybasic/laySelectStippleForm.h b/src/laybasic/laybasic/laySelectStippleForm.h similarity index 100% rename from src/laybasic/laySelectStippleForm.h rename to src/laybasic/laybasic/laySelectStippleForm.h diff --git a/src/laybasic/laySelector.cc b/src/laybasic/laybasic/laySelector.cc similarity index 100% rename from src/laybasic/laySelector.cc rename to src/laybasic/laybasic/laySelector.cc diff --git a/src/laybasic/laySelector.h b/src/laybasic/laybasic/laySelector.h similarity index 100% rename from src/laybasic/laySelector.h rename to src/laybasic/laybasic/laySelector.h diff --git a/src/laybasic/laySnap.cc b/src/laybasic/laybasic/laySnap.cc similarity index 100% rename from src/laybasic/laySnap.cc rename to src/laybasic/laybasic/laySnap.cc diff --git a/src/laybasic/laySnap.h b/src/laybasic/laybasic/laySnap.h similarity index 100% rename from src/laybasic/laySnap.h rename to src/laybasic/laybasic/laySnap.h diff --git a/src/laybasic/layStipplePalette.cc b/src/laybasic/laybasic/layStipplePalette.cc similarity index 100% rename from src/laybasic/layStipplePalette.cc rename to src/laybasic/laybasic/layStipplePalette.cc diff --git a/src/laybasic/layStipplePalette.h b/src/laybasic/laybasic/layStipplePalette.h similarity index 100% rename from src/laybasic/layStipplePalette.h rename to src/laybasic/laybasic/layStipplePalette.h diff --git a/src/laybasic/layStream.cc b/src/laybasic/laybasic/layStream.cc similarity index 100% rename from src/laybasic/layStream.cc rename to src/laybasic/laybasic/layStream.cc diff --git a/src/laybasic/layStream.h b/src/laybasic/laybasic/layStream.h similarity index 100% rename from src/laybasic/layStream.h rename to src/laybasic/laybasic/layStream.h diff --git a/src/laybasic/layTechnology.cc b/src/laybasic/laybasic/layTechnology.cc similarity index 100% rename from src/laybasic/layTechnology.cc rename to src/laybasic/laybasic/layTechnology.cc diff --git a/src/laybasic/layTechnology.h b/src/laybasic/laybasic/layTechnology.h similarity index 100% rename from src/laybasic/layTechnology.h rename to src/laybasic/laybasic/layTechnology.h diff --git a/src/laybasic/layTipDialog.cc b/src/laybasic/laybasic/layTipDialog.cc similarity index 100% rename from src/laybasic/layTipDialog.cc rename to src/laybasic/laybasic/layTipDialog.cc diff --git a/src/laybasic/layTipDialog.h b/src/laybasic/laybasic/layTipDialog.h similarity index 100% rename from src/laybasic/layTipDialog.h rename to src/laybasic/laybasic/layTipDialog.h diff --git a/src/laybasic/layViewObject.cc b/src/laybasic/laybasic/layViewObject.cc similarity index 100% rename from src/laybasic/layViewObject.cc rename to src/laybasic/laybasic/layViewObject.cc diff --git a/src/laybasic/layViewObject.h b/src/laybasic/laybasic/layViewObject.h similarity index 100% rename from src/laybasic/layViewObject.h rename to src/laybasic/laybasic/layViewObject.h diff --git a/src/laybasic/layViewOp.cc b/src/laybasic/laybasic/layViewOp.cc similarity index 100% rename from src/laybasic/layViewOp.cc rename to src/laybasic/laybasic/layViewOp.cc diff --git a/src/laybasic/layViewOp.h b/src/laybasic/laybasic/layViewOp.h similarity index 100% rename from src/laybasic/layViewOp.h rename to src/laybasic/laybasic/layViewOp.h diff --git a/src/laybasic/layViewport.cc b/src/laybasic/laybasic/layViewport.cc similarity index 100% rename from src/laybasic/layViewport.cc rename to src/laybasic/laybasic/layViewport.cc diff --git a/src/laybasic/layViewport.h b/src/laybasic/laybasic/layViewport.h similarity index 100% rename from src/laybasic/layViewport.h rename to src/laybasic/laybasic/layViewport.h diff --git a/src/laybasic/layWidgets.cc b/src/laybasic/laybasic/layWidgets.cc similarity index 100% rename from src/laybasic/layWidgets.cc rename to src/laybasic/laybasic/layWidgets.cc diff --git a/src/laybasic/layWidgets.h b/src/laybasic/laybasic/layWidgets.h similarity index 100% rename from src/laybasic/layWidgets.h rename to src/laybasic/laybasic/layWidgets.h diff --git a/src/laybasic/layZoomBox.cc b/src/laybasic/laybasic/layZoomBox.cc similarity index 100% rename from src/laybasic/layZoomBox.cc rename to src/laybasic/laybasic/layZoomBox.cc diff --git a/src/laybasic/layZoomBox.h b/src/laybasic/laybasic/layZoomBox.h similarity index 100% rename from src/laybasic/layZoomBox.h rename to src/laybasic/laybasic/layZoomBox.h diff --git a/src/laybasic/laybasic/laybasic.pro b/src/laybasic/laybasic/laybasic.pro new file mode 100644 index 000000000..7ff5d66c2 --- /dev/null +++ b/src/laybasic/laybasic/laybasic.pro @@ -0,0 +1,286 @@ + +DESTDIR = $$OUT_PWD/../.. +TARGET = klayout_laybasic + +include($$PWD/../../lib.pri) + +DEFINES += MAKE_LAYBASIC_LIBRARY + +FORMS = \ + AlignCellOptionsDialog.ui \ + BookmarkManagementForm.ui \ + BrowseInstancesConfigPage.ui \ + BrowseInstancesForm.ui \ + BrowserDialog.ui \ + BrowserPanel.ui \ + BrowseShapesConfigPage.ui \ + BrowseShapesForm.ui \ + CIFReaderOptionPage.ui \ + CIFWriterOptionPage.ui \ + CellSelectionForm.ui \ + ClearLayerModeDialog.ui \ + ConfigurationDialog.ui \ + CopyCellModeDialog.ui \ + DXFReaderOptionPage.ui \ + DXFWriterOptionPage.ui \ + DeleteCellModeDialog.ui \ + DuplicateLayerDialog.ui \ + EditStipplesForm.ui \ + FlattenInstOptionsDialog.ui \ + GDS2ReaderOptionPage.ui \ + GDS2WriterOptionPage.ui \ + GridNetConfigPage.ui \ + LayerMappingWidget.ui \ + LayerSourceDialog.ui \ + LayoutProperties.ui \ + LayoutViewConfigPage1.ui \ + LayoutViewConfigPage2a.ui \ + LayoutViewConfigPage2b.ui \ + LayoutViewConfigPage2c.ui \ + LayoutViewConfigPage3a.ui \ + LayoutViewConfigPage3b.ui \ + LayoutViewConfigPage3c.ui \ + LayoutViewConfigPage3f.ui \ + LayoutViewConfigPage4.ui \ + LayoutViewConfigPage5.ui \ + LayoutViewConfigPage6.ui \ + LayoutViewConfigPage7.ui \ + LayoutViewConfigPage.ui \ + LibraryCellSelectionForm.ui \ + LoadLayoutOptionsDialog.ui \ + MarkerBrowserConfigPage2.ui \ + MarkerBrowserConfigPage.ui \ + MarkerBrowserDialog.ui \ + MarkerBrowserPage.ui \ + MarkerBrowserSnapshotView.ui \ + MoveOptionsDialog.ui \ + MoveToOptionsDialog.ui \ + NewCellPropertiesDialog.ui \ + NewLayerPropertiesDialog.ui \ + NewLayoutPropertiesDialog.ui \ + OASISWriterOptionPage.ui \ + OpenLayoutModeDialog.ui \ + PropertiesDialog.ui \ + RenameCellDialog.ui \ + ReplaceCellOptionsDialog.ui \ + SaveLayoutOptionsDialog.ui \ + SaveLayoutAsOptionsDialog.ui \ + SelectStippleForm.ui \ + TipDialog.ui \ + UserPropertiesForm.ui \ + UserPropertiesEditForm.ui \ + SpecificLoadLayoutOptionsDialog.ui \ + CommonReaderOptionsPage.ui \ + SelectLineStyleForm.ui \ + LayoutViewConfigPage6a.ui \ + EditLineStylesForm.ui + +RESOURCES = \ + +SOURCES = \ + gtf.cc \ + gsiDeclLayDialogs.cc \ + gsiDeclLayLayers.cc \ + gsiDeclLayLayoutView.cc \ + gsiDeclLayMarker.cc \ + gsiDeclLayMenu.cc \ + gsiDeclLayPlugin.cc \ + gsiDeclLayStream.cc \ + layAbstractMenu.cc \ + layAbstractMenuProvider.cc \ + layAnnotationShapes.cc \ + layBitmap.cc \ + layBitmapRenderer.cc \ + layBitmapsToImage.cc \ + layBookmarkList.cc \ + layBookmarkManagementForm.cc \ + layBrowseInstancesForm.cc \ + layBrowser.cc \ + layBrowserDialog.cc \ + layBrowserPanel.cc \ + layBrowseShapesForm.cc \ + layCanvasPlane.cc \ + layCellSelectionForm.cc \ + layCellTreeModel.cc \ + layCellView.cc \ + layCIFReaderPlugin.cc \ + layCIFWriterPlugin.cc \ + layColorPalette.cc \ + layConfigurationDialog.cc \ + layConverters.cc \ + layCursor.cc \ + layDialogs.cc \ + layDisplayState.cc \ + layDitherPattern.cc \ + layDrawing.cc \ + layDXFReaderPlugin.cc \ + layDXFWriterPlugin.cc \ + layEditable.cc \ + layEditStipplesForm.cc \ + layEditStippleWidget.cc \ + layFileDialog.cc \ + layFinder.cc \ + layFixedFont.cc \ + layGDS2ReaderPlugin.cc \ + layGDS2WriterPlugin.cc \ + layGridNet.cc \ + layHierarchyControlPanel.cc \ + layLayerControlPanel.cc \ + layLayerMappingWidget.cc \ + layLayerProperties.cc \ + layLayerToolbox.cc \ + layLayerTreeModel.cc \ + layLayoutCanvas.cc \ + layLayoutPropertiesForm.cc \ + layLayoutView.cc \ + layLayoutViewConfigPages.cc \ + layLoadLayoutOptionsDialog.cc \ + layMarker.cc \ + layMouseTracker.cc \ + layMove.cc \ + layOASISWriterPlugin.cc \ + layObjectInstPath.cc \ + layParsedLayerSource.cc \ + layPlugin.cc \ + layProperties.cc \ + layPropertiesDialog.cc \ + layQtTools.cc \ + layRedrawLayerInfo.cc \ + layRedrawThreadCanvas.cc \ + layRedrawThread.cc \ + layRedrawThreadWorker.cc \ + layRenderer.cc \ + layRubberBox.cc \ + laySaveLayoutOptionsDialog.cc \ + laySelector.cc \ + laySelectStippleForm.cc \ + laySnap.cc \ + layStipplePalette.cc \ + layStream.cc \ + layTechnology.cc \ + layTipDialog.cc \ + layViewObject.cc \ + layViewOp.cc \ + layViewport.cc \ + layWidgets.cc \ + layZoomBox.cc \ + rdbInfoWidget.cc \ + rdbMarkerBrowser.cc \ + rdbMarkerBrowserDialog.cc \ + rdbMarkerBrowserPage.cc \ + layOASISReaderPlugin.cc \ + layCommonReaderPlugin.cc \ + layLineStyles.cc \ + laySelectLineStyleForm.cc \ + layLineStylePalette.cc \ + layEditLineStylesForm.cc \ + layEditLineStyleWidget.cc \ + layBackgroundAwareTreeStyle.cc \ + gsiDeclLayTechnologies.cc + +HEADERS = \ + gtf.h \ + layAbstractMenu.h \ + layAbstractMenuProvider.h \ + layAnnotationShapes.h \ + layBitmap.h \ + layBitmapRenderer.h \ + layBitmapsToImage.h \ + layBookmarkList.h \ + layBookmarkManagementForm.h \ + layBrowseInstancesForm.h \ + layBrowserDialog.h \ + layBrowser.h \ + layBrowserPanel.h \ + layBrowseShapesForm.h \ + layCanvasPlane.h \ + layCellSelectionForm.h \ + layCellTreeModel.h \ + layCellView.h \ + layCIFReaderPlugin.h \ + layCIFWriterPlugin.h \ + layColorPalette.h \ + layConfigurationDialog.h \ + layConverters.h \ + layCursor.h \ + layDialogs.h \ + layDisplayState.h \ + layDitherPattern.h \ + layDrawing.h \ + layDXFReaderPlugin.h \ + layDXFWriterPlugin.h \ + layEditable.h \ + layEditStipplesForm.h \ + layEditStippleWidget.h \ + layFileDialog.h \ + layFinder.h \ + layFixedFont.h \ + layGDS2ReaderPlugin.h \ + layGDS2WriterPlugin.h \ + layGridNet.h \ + layHierarchyControlPanel.h \ + layLayerControlPanel.h \ + layLayerMappingWidget.h \ + layLayerProperties.h \ + layLayerToolbox.h \ + layLayerTreeModel.h \ + layLayoutCanvas.h \ + layLayoutPropertiesForm.h \ + layLayoutViewConfigPages.h \ + layLayoutView.h \ + layLoadLayoutOptionsDialog.h \ + layMarker.h \ + layMouseTracker.h \ + layMove.h \ + layOASISWriterPlugin.h \ + layObjectInstPath.h \ + layParsedLayerSource.h \ + layPlugin.h \ + layPropertiesDialog.h \ + layProperties.h \ + layQtTools.h \ + layRedrawLayerInfo.h \ + layRedrawThreadCanvas.h \ + layRedrawThread.h \ + layRedrawThreadWorker.h \ + layRenderer.h \ + layRubberBox.h \ + laySaveLayoutOptionsDialog.h \ + laySelector.h \ + laySelectStippleForm.h \ + laySnap.h \ + layStipplePalette.h \ + layStream.h \ + layTechnology.h \ + layTipDialog.h \ + layViewObject.h \ + layViewOp.h \ + layViewport.h \ + layWidgets.h \ + layZoomBox.h \ + rdbInfoWidget.h \ + rdbMarkerBrowserDialog.h \ + rdbMarkerBrowser.h \ + rdbMarkerBrowserPage.h \ + layOASISReaderPlugin.h \ + layCommonReaderPlugin.h \ + layLineStyles.h \ + laySelectLineStyleForm.h \ + layLineStylePalette.h \ + layEditLineStylesForm.h \ + layEditLineStyleWidget.h \ + laybasicCommon.h \ + laybasicConfig.h \ + layBackgroundAwareTreeStyle.h + +INCLUDEPATH += $$TL_INC $$GSI_INC $$DB_INC $$RDB_INC +DEPENDPATH += $$TL_INC $$GSI_INC $$DB_INC $$RDB_INC +LIBS += -L$$DESTDIR -lklayout_tl -lklayout_gsi -lklayout_db -lklayout_rdb + +INCLUDEPATH += $$GSIQT_INC +DEPENDPATH += $$GSIQT_INC + +equals(HAVE_QTBINDINGS, "1") { + LIBS += -lklayout_gsiqt +} + diff --git a/src/laybasic/laybasicCommon.h b/src/laybasic/laybasic/laybasicCommon.h similarity index 100% rename from src/laybasic/laybasicCommon.h rename to src/laybasic/laybasic/laybasicCommon.h diff --git a/src/laybasic/laybasicConfig.h b/src/laybasic/laybasic/laybasicConfig.h similarity index 100% rename from src/laybasic/laybasicConfig.h rename to src/laybasic/laybasic/laybasicConfig.h diff --git a/src/laybasic/rdbInfoWidget.cc b/src/laybasic/laybasic/rdbInfoWidget.cc similarity index 100% rename from src/laybasic/rdbInfoWidget.cc rename to src/laybasic/laybasic/rdbInfoWidget.cc diff --git a/src/laybasic/rdbInfoWidget.h b/src/laybasic/laybasic/rdbInfoWidget.h similarity index 100% rename from src/laybasic/rdbInfoWidget.h rename to src/laybasic/laybasic/rdbInfoWidget.h diff --git a/src/laybasic/rdbMarkerBrowser.cc b/src/laybasic/laybasic/rdbMarkerBrowser.cc similarity index 100% rename from src/laybasic/rdbMarkerBrowser.cc rename to src/laybasic/laybasic/rdbMarkerBrowser.cc diff --git a/src/laybasic/rdbMarkerBrowser.h b/src/laybasic/laybasic/rdbMarkerBrowser.h similarity index 100% rename from src/laybasic/rdbMarkerBrowser.h rename to src/laybasic/laybasic/rdbMarkerBrowser.h diff --git a/src/laybasic/rdbMarkerBrowserDialog.cc b/src/laybasic/laybasic/rdbMarkerBrowserDialog.cc similarity index 100% rename from src/laybasic/rdbMarkerBrowserDialog.cc rename to src/laybasic/laybasic/rdbMarkerBrowserDialog.cc diff --git a/src/laybasic/rdbMarkerBrowserDialog.h b/src/laybasic/laybasic/rdbMarkerBrowserDialog.h similarity index 100% rename from src/laybasic/rdbMarkerBrowserDialog.h rename to src/laybasic/laybasic/rdbMarkerBrowserDialog.h diff --git a/src/laybasic/rdbMarkerBrowserPage.cc b/src/laybasic/laybasic/rdbMarkerBrowserPage.cc similarity index 100% rename from src/laybasic/rdbMarkerBrowserPage.cc rename to src/laybasic/laybasic/rdbMarkerBrowserPage.cc diff --git a/src/laybasic/rdbMarkerBrowserPage.h b/src/laybasic/laybasic/rdbMarkerBrowserPage.h similarity index 100% rename from src/laybasic/rdbMarkerBrowserPage.h rename to src/laybasic/laybasic/rdbMarkerBrowserPage.h diff --git a/src/unit_tests/layAnnotationShapes.cc b/src/laybasic/unit_tests/layAnnotationShapes.cc similarity index 100% rename from src/unit_tests/layAnnotationShapes.cc rename to src/laybasic/unit_tests/layAnnotationShapes.cc diff --git a/src/unit_tests/layBitmap.cc b/src/laybasic/unit_tests/layBitmap.cc similarity index 100% rename from src/unit_tests/layBitmap.cc rename to src/laybasic/unit_tests/layBitmap.cc diff --git a/src/unit_tests/layBitmapsToImage.cc b/src/laybasic/unit_tests/layBitmapsToImage.cc similarity index 100% rename from src/unit_tests/layBitmapsToImage.cc rename to src/laybasic/unit_tests/layBitmapsToImage.cc diff --git a/src/unit_tests/layLayerProperties.cc b/src/laybasic/unit_tests/layLayerProperties.cc similarity index 98% rename from src/unit_tests/layLayerProperties.cc rename to src/laybasic/unit_tests/layLayerProperties.cc index f8141fb77..8a5e3f12f 100644 --- a/src/unit_tests/layLayerProperties.cc +++ b/src/laybasic/unit_tests/layLayerProperties.cc @@ -24,8 +24,6 @@ #include "layLayerProperties.h" #include "layLayoutView.h" -#include "layMainWindow.h" -#include "layApplication.h" #include "tlXMLParser.h" #include "dbLayout.h" @@ -234,6 +232,7 @@ TEST (2a) EXPECT_EQ (compare_real (flat_ref, list), true); } +// Testing correctness of compare_real implementation (hence compare vs. false) TEST (2b) { tl::XMLStringSource s ( @@ -303,6 +302,7 @@ TEST (2b) EXPECT_EQ (compare_real (flat_ref, list), false); } +// Testing correctness of compare_real implementation (hence compare vs. false) TEST (2c) { tl::XMLStringSource s ( @@ -375,6 +375,7 @@ TEST (2c) EXPECT_EQ (compare_real (flat_ref, list), false); } +// Testing correctness of compare_real implementation (hence compare vs. false) TEST (2d) { tl::XMLStringSource s ( @@ -1304,7 +1305,7 @@ TEST (16) lay::LayerPropertiesList list; db::Manager mgr; - lay::LayoutView view (&mgr, lay::Application::instance ()->is_editable (), lay::MainWindow::instance ()); + lay::LayoutView view (&mgr, is_editable (), 0); list.attach_view (&view, 0); int cv1 = view.create_layout ("", true, false); @@ -1356,7 +1357,7 @@ TEST (17) lay::LayerPropertiesList list; db::Manager mgr; - lay::LayoutView view (&mgr, lay::Application::instance ()->is_editable (), lay::MainWindow::instance ()); + lay::LayoutView view (&mgr, is_editable (), 0); list.attach_view (&view, 0); int cv1 = view.create_layout ("", true, false); @@ -1423,7 +1424,7 @@ TEST (18) lay::LayerPropertiesList list; db::Manager mgr; - lay::LayoutView view (&mgr, lay::Application::instance ()->is_editable (), lay::MainWindow::instance ()); + lay::LayoutView view (&mgr, is_editable (), 0); list.attach_view (&view, 0); int cv1 = view.create_layout ("", true, false); @@ -1491,7 +1492,7 @@ TEST (19) lay::LayerPropertiesList list; db::Manager mgr; - lay::LayoutView view (&mgr, lay::Application::instance ()->is_editable (), lay::MainWindow::instance ()); + lay::LayoutView view (&mgr, is_editable (), 0); list.attach_view (&view, 0); int cv1 = view.create_layout ("", true, false); @@ -1560,7 +1561,7 @@ TEST (20) lay::LayerPropertiesList list; db::Manager mgr; - lay::LayoutView view (&mgr, lay::Application::instance ()->is_editable (), lay::MainWindow::instance ()); + lay::LayoutView view (&mgr, is_editable (), 0); list.attach_view (&view, 0); int cv1 = view.create_layout ("", true, false); @@ -1632,7 +1633,7 @@ TEST (21) lay::LayerPropertiesList list; db::Manager mgr; - lay::LayoutView view (&mgr, lay::Application::instance ()->is_editable (), lay::MainWindow::instance ()); + lay::LayoutView view (&mgr, is_editable (), 0); list.attach_view (&view, 0); int cv1 = view.create_layout ("", true, false); diff --git a/src/unit_tests/layParsedLayerSource.cc b/src/laybasic/unit_tests/layParsedLayerSource.cc similarity index 100% rename from src/unit_tests/layParsedLayerSource.cc rename to src/laybasic/unit_tests/layParsedLayerSource.cc diff --git a/src/unit_tests/layRenderer.cc b/src/laybasic/unit_tests/layRenderer.cc similarity index 100% rename from src/unit_tests/layRenderer.cc rename to src/laybasic/unit_tests/layRenderer.cc diff --git a/src/unit_tests/laySnap.cc b/src/laybasic/unit_tests/laySnap.cc similarity index 100% rename from src/unit_tests/laySnap.cc rename to src/laybasic/unit_tests/laySnap.cc diff --git a/src/laybasic/unit_tests/unit_tests.pro b/src/laybasic/unit_tests/unit_tests.pro new file mode 100644 index 000000000..f7b7cc8b4 --- /dev/null +++ b/src/laybasic/unit_tests/unit_tests.pro @@ -0,0 +1,22 @@ + +DESTDIR_UT = $$OUT_PWD/../.. +DESTDIR = $$OUT_PWD/.. + +TARGET = laybasic_tests + +include($$PWD/../../lib_ut.pri) + +SOURCES = \ + layAnnotationShapes.cc \ + layBitmap.cc \ + layBitmapsToImage.cc \ + layLayerProperties.cc \ + layParsedLayerSource.cc \ + layRenderer.cc \ + laySnap.cc \ + +INCLUDEPATH += $$TL_INC $$LAYBASIC_INC $$DB_INC $$GSI_INC $$UT_INC +DEPENDPATH += $$TL_INC $$LAYBASIC_INC $$DB_INC $$GSI_INC $$UT_INC + +LIBS += -L$$DESTDIR_UT -lklayout_laybasic -lklayout_db -lklayout_tl -lklayout_gsi -lklayout_ut + diff --git a/src/lib/lib.pro b/src/lib/lib.pro index 3b762c418..2adadf4f4 100644 --- a/src/lib/lib.pro +++ b/src/lib/lib.pro @@ -1,40 +1,6 @@ - -DESTDIR = $$OUT_PWD/.. -TARGET = klayout_lib - -include($$PWD/../lib.pri) - -DEFINES += MAKE_LIB_LIBRARY - -HEADERS = \ - libBasicArc.h \ - libBasicCircle.h \ - libBasicDonut.h \ - libBasicEllipse.h \ - libBasicPie.h \ - libBasicRoundPath.h \ - libBasicRoundPolygon.h \ - libBasicStrokedPolygon.h \ - libBasicText.h \ - libForceLink.h - -SOURCES = \ - libForceLink.cc \ - libBasic.cc \ - libBasicArc.cc \ - libBasicCircle.cc \ - libBasicDonut.cc \ - libBasicEllipse.cc \ - libBasicPie.cc \ - libBasicRoundPath.cc \ - libBasicRoundPolygon.cc \ - libBasicStrokedPolygon.cc \ - libBasicText.cc - -RESOURCES = \ - libResources.qrc - -INCLUDEPATH += $$TL_INC $$GSI_INC $$DB_INC -DEPENDPATH += $$TL_INC $$GSI_INC $$DB_INC -LIBS += -L$$DESTDIR -lklayout_gsi -lklayout_tl -lklayout_db - + +TEMPLATE = subdirs +SUBDIRS = lib unit_tests + +unit_tests.depends += lib + diff --git a/src/lib/lib/lib.pro b/src/lib/lib/lib.pro new file mode 100644 index 000000000..8352f19af --- /dev/null +++ b/src/lib/lib/lib.pro @@ -0,0 +1,40 @@ + +DESTDIR = $$OUT_PWD/../.. +TARGET = klayout_lib + +include($$PWD/../../lib.pri) + +DEFINES += MAKE_LIB_LIBRARY + +HEADERS = \ + libBasicArc.h \ + libBasicCircle.h \ + libBasicDonut.h \ + libBasicEllipse.h \ + libBasicPie.h \ + libBasicRoundPath.h \ + libBasicRoundPolygon.h \ + libBasicStrokedPolygon.h \ + libBasicText.h \ + libForceLink.h + +SOURCES = \ + libForceLink.cc \ + libBasic.cc \ + libBasicArc.cc \ + libBasicCircle.cc \ + libBasicDonut.cc \ + libBasicEllipse.cc \ + libBasicPie.cc \ + libBasicRoundPath.cc \ + libBasicRoundPolygon.cc \ + libBasicStrokedPolygon.cc \ + libBasicText.cc + +RESOURCES = \ + libResources.qrc + +INCLUDEPATH += $$TL_INC $$GSI_INC $$DB_INC +DEPENDPATH += $$TL_INC $$GSI_INC $$DB_INC +LIBS += -L$$DESTDIR -lklayout_gsi -lklayout_tl -lklayout_db + diff --git a/src/lib/libBasic.cc b/src/lib/lib/libBasic.cc similarity index 100% rename from src/lib/libBasic.cc rename to src/lib/lib/libBasic.cc diff --git a/src/lib/libBasicArc.cc b/src/lib/lib/libBasicArc.cc similarity index 100% rename from src/lib/libBasicArc.cc rename to src/lib/lib/libBasicArc.cc diff --git a/src/lib/libBasicArc.h b/src/lib/lib/libBasicArc.h similarity index 100% rename from src/lib/libBasicArc.h rename to src/lib/lib/libBasicArc.h diff --git a/src/lib/libBasicCircle.cc b/src/lib/lib/libBasicCircle.cc similarity index 100% rename from src/lib/libBasicCircle.cc rename to src/lib/lib/libBasicCircle.cc diff --git a/src/lib/libBasicCircle.h b/src/lib/lib/libBasicCircle.h similarity index 100% rename from src/lib/libBasicCircle.h rename to src/lib/lib/libBasicCircle.h diff --git a/src/lib/libBasicDonut.cc b/src/lib/lib/libBasicDonut.cc similarity index 100% rename from src/lib/libBasicDonut.cc rename to src/lib/lib/libBasicDonut.cc diff --git a/src/lib/libBasicDonut.h b/src/lib/lib/libBasicDonut.h similarity index 100% rename from src/lib/libBasicDonut.h rename to src/lib/lib/libBasicDonut.h diff --git a/src/lib/libBasicEllipse.cc b/src/lib/lib/libBasicEllipse.cc similarity index 100% rename from src/lib/libBasicEllipse.cc rename to src/lib/lib/libBasicEllipse.cc diff --git a/src/lib/libBasicEllipse.h b/src/lib/lib/libBasicEllipse.h similarity index 100% rename from src/lib/libBasicEllipse.h rename to src/lib/lib/libBasicEllipse.h diff --git a/src/lib/libBasicPie.cc b/src/lib/lib/libBasicPie.cc similarity index 100% rename from src/lib/libBasicPie.cc rename to src/lib/lib/libBasicPie.cc diff --git a/src/lib/libBasicPie.h b/src/lib/lib/libBasicPie.h similarity index 100% rename from src/lib/libBasicPie.h rename to src/lib/lib/libBasicPie.h diff --git a/src/lib/libBasicRoundPath.cc b/src/lib/lib/libBasicRoundPath.cc similarity index 100% rename from src/lib/libBasicRoundPath.cc rename to src/lib/lib/libBasicRoundPath.cc diff --git a/src/lib/libBasicRoundPath.h b/src/lib/lib/libBasicRoundPath.h similarity index 100% rename from src/lib/libBasicRoundPath.h rename to src/lib/lib/libBasicRoundPath.h diff --git a/src/lib/libBasicRoundPolygon.cc b/src/lib/lib/libBasicRoundPolygon.cc similarity index 100% rename from src/lib/libBasicRoundPolygon.cc rename to src/lib/lib/libBasicRoundPolygon.cc diff --git a/src/lib/libBasicRoundPolygon.h b/src/lib/lib/libBasicRoundPolygon.h similarity index 100% rename from src/lib/libBasicRoundPolygon.h rename to src/lib/lib/libBasicRoundPolygon.h diff --git a/src/lib/libBasicStrokedPolygon.cc b/src/lib/lib/libBasicStrokedPolygon.cc similarity index 100% rename from src/lib/libBasicStrokedPolygon.cc rename to src/lib/lib/libBasicStrokedPolygon.cc diff --git a/src/lib/libBasicStrokedPolygon.h b/src/lib/lib/libBasicStrokedPolygon.h similarity index 100% rename from src/lib/libBasicStrokedPolygon.h rename to src/lib/lib/libBasicStrokedPolygon.h diff --git a/src/lib/libBasicText.cc b/src/lib/lib/libBasicText.cc similarity index 100% rename from src/lib/libBasicText.cc rename to src/lib/lib/libBasicText.cc diff --git a/src/lib/libBasicText.h b/src/lib/lib/libBasicText.h similarity index 100% rename from src/lib/libBasicText.h rename to src/lib/lib/libBasicText.h diff --git a/src/lib/libCommon.h b/src/lib/lib/libCommon.h similarity index 100% rename from src/lib/libCommon.h rename to src/lib/lib/libCommon.h diff --git a/src/lib/libForceLink.cc b/src/lib/lib/libForceLink.cc similarity index 100% rename from src/lib/libForceLink.cc rename to src/lib/lib/libForceLink.cc diff --git a/src/lib/libForceLink.h b/src/lib/lib/libForceLink.h similarity index 100% rename from src/lib/libForceLink.h rename to src/lib/lib/libForceLink.h diff --git a/src/lib/libResources.qrc b/src/lib/lib/libResources.qrc similarity index 100% rename from src/lib/libResources.qrc rename to src/lib/lib/libResources.qrc diff --git a/src/lib/unit_tests/libBasicTests.cc b/src/lib/unit_tests/libBasicTests.cc new file mode 100644 index 000000000..b83cb3e62 --- /dev/null +++ b/src/lib/unit_tests/libBasicTests.cc @@ -0,0 +1,31 @@ + +/* + + KLayout Layout Viewer + Copyright (C) 2006-2017 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 "utHead.h" + +TEST(1) +{ + // TODO: add tests for lib specific things + throw tl::CancelException (); // skip this test to indicate that there is nothing yet +} + diff --git a/src/lib/unit_tests/unit_tests.pro b/src/lib/unit_tests/unit_tests.pro new file mode 100644 index 000000000..58f765bca --- /dev/null +++ b/src/lib/unit_tests/unit_tests.pro @@ -0,0 +1,16 @@ + +DESTDIR_UT = $$OUT_PWD/../.. +DESTDIR = $$OUT_PWD/.. + +TARGET = lib_tests + +include($$PWD/../../lib_ut.pri) + +SOURCES = \ + libBasicTests.cc \ + +INCLUDEPATH += $$LIB_INC $$TL_INC $$DB_INC $$GSI_INC $$UT_INC +DEPENDPATH += $$LIB_INC $$TL_INC $$DB_INC $$GSI_INC $$UT_INC + +LIBS += -L$$DESTDIR_UT -lklayout_lib -lklayout_db -lklayout_tl -lklayout_gsi -lklayout_ut + diff --git a/src/lym/lym.pro b/src/lym/lym.pro index 59f41828e..4c910e908 100644 --- a/src/lym/lym.pro +++ b/src/lym/lym.pro @@ -1,40 +1,6 @@ -DESTDIR = $$OUT_PWD/.. -TARGET = klayout_lym +TEMPLATE = subdirs +SUBDIRS = lym unit_tests -include($$PWD/../lib.pri) +unit_tests.depends += lym -DEFINES += MAKE_LYM_LIBRARY - -SOURCES = \ - gsiDeclLymMacro.cc \ - lymMacroInterpreter.cc \ - lymMacro.cc \ - -HEADERS = \ - lymCommon.h \ - lymMacroInterpreter.h \ - lymMacro.h \ - -INCLUDEPATH += $$TL_INC $$GSI_INC -DEPENDPATH += $$TL_INC $$GSI_INC - -LIBS += -L$$DESTDIR -lklayout_tl -lklayout_gsi - -INCLUDEPATH += $$RBA_INC -DEPENDPATH += $$RBA_INC - -equals(HAVE_RUBY, "1") { - LIBS += -lklayout_rba -} else { - LIBS += -lklayout_rbastub -} - -INCLUDEPATH += $$PYA_INC -DEPENDPATH += $$PYA_INC - -equals(HAVE_PYTHON, "1") { - LIBS += -lklayout_pya -} else { - LIBS += -lklayout_pyastub -} diff --git a/src/lym/gsiDeclLymMacro.cc b/src/lym/lym/gsiDeclLymMacro.cc similarity index 100% rename from src/lym/gsiDeclLymMacro.cc rename to src/lym/lym/gsiDeclLymMacro.cc diff --git a/src/lym/lym/lym.pro b/src/lym/lym/lym.pro new file mode 100644 index 000000000..24a21587b --- /dev/null +++ b/src/lym/lym/lym.pro @@ -0,0 +1,40 @@ + +DESTDIR = $$OUT_PWD/../.. +TARGET = klayout_lym + +include($$PWD/../../lib.pri) + +DEFINES += MAKE_LYM_LIBRARY + +SOURCES = \ + gsiDeclLymMacro.cc \ + lymMacroInterpreter.cc \ + lymMacro.cc \ + +HEADERS = \ + lymCommon.h \ + lymMacroInterpreter.h \ + lymMacro.h \ + +INCLUDEPATH += $$TL_INC $$GSI_INC +DEPENDPATH += $$TL_INC $$GSI_INC + +LIBS += -L$$DESTDIR -lklayout_tl -lklayout_gsi + +INCLUDEPATH += $$RBA_INC +DEPENDPATH += $$RBA_INC + +equals(HAVE_RUBY, "1") { + LIBS += -lklayout_rba +} else { + LIBS += -lklayout_rbastub +} + +INCLUDEPATH += $$PYA_INC +DEPENDPATH += $$PYA_INC + +equals(HAVE_PYTHON, "1") { + LIBS += -lklayout_pya +} else { + LIBS += -lklayout_pyastub +} diff --git a/src/lym/lymCommon.h b/src/lym/lym/lymCommon.h similarity index 100% rename from src/lym/lymCommon.h rename to src/lym/lym/lymCommon.h diff --git a/src/lym/lymMacro.cc b/src/lym/lym/lymMacro.cc similarity index 100% rename from src/lym/lymMacro.cc rename to src/lym/lym/lymMacro.cc diff --git a/src/lym/lymMacro.h b/src/lym/lym/lymMacro.h similarity index 100% rename from src/lym/lymMacro.h rename to src/lym/lym/lymMacro.h diff --git a/src/lym/lymMacroInterpreter.cc b/src/lym/lym/lymMacroInterpreter.cc similarity index 100% rename from src/lym/lymMacroInterpreter.cc rename to src/lym/lym/lymMacroInterpreter.cc diff --git a/src/lym/lymMacroInterpreter.h b/src/lym/lym/lymMacroInterpreter.h similarity index 100% rename from src/lym/lymMacroInterpreter.h rename to src/lym/lym/lymMacroInterpreter.h diff --git a/src/lym/unit_tests/lymBasicTests.cc b/src/lym/unit_tests/lymBasicTests.cc new file mode 100644 index 000000000..23215669a --- /dev/null +++ b/src/lym/unit_tests/lymBasicTests.cc @@ -0,0 +1,31 @@ + +/* + + KLayout Layout Viewer + Copyright (C) 2006-2017 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 "utHead.h" + +TEST(1) +{ + // TODO: add tests for lym specific things + throw tl::CancelException (); // skip this test to indicate that there is nothing yet +} + diff --git a/src/lym/unit_tests/unit_tests.pro b/src/lym/unit_tests/unit_tests.pro new file mode 100644 index 000000000..293675fc6 --- /dev/null +++ b/src/lym/unit_tests/unit_tests.pro @@ -0,0 +1,16 @@ + +DESTDIR_UT = $$OUT_PWD/../.. +DESTDIR = $$OUT_PWD/.. + +TARGET = lym_tests + +include($$PWD/../../lib_ut.pri) + +SOURCES = \ + lymBasicTests.cc \ + +INCLUDEPATH += $$LYM_INC $$TL_INC $$DB_INC $$GSI_INC $$UT_INC +DEPENDPATH += $$LYM_INC $$TL_INC $$DB_INC $$GSI_INC $$UT_INC + +LIBS += -L$$DESTDIR_UT -lklayout_lym -lklayout_tl -lklayout_db -lklayout_gsi -lklayout_ut + diff --git a/src/rdb/rdb.pro b/src/rdb/rdb.pro index eb0c4efec..294728103 100644 --- a/src/rdb/rdb.pro +++ b/src/rdb/rdb.pro @@ -1,34 +1,6 @@ -DESTDIR = $$OUT_PWD/.. -TARGET = klayout_rdb +TEMPLATE = subdirs +SUBDIRS = rdb unit_tests -include($$PWD/../lib.pri) - -DEFINES += MAKE_RDB_LIBRARY - -FORMS = \ - -RESOURCES = \ - -SOURCES = \ - gsiDeclRdb.cc \ - rdb.cc \ - rdbForceLink.cc \ - rdbFile.cc \ - rdbReader.cc \ - rdbRVEReader.cc \ - rdbTiledRdbOutputReceiver.cc \ - rdbUtils.cc \ - -HEADERS = \ - rdb.h \ - rdbForceLink.h \ - rdbReader.h \ - rdbTiledRdbOutputReceiver.h \ - rdbUtils.h \ - rdbCommon.h - -INCLUDEPATH += $$TL_INC $$GSI_INC $$DB_INC -DEPENDPATH += $$TL_INC $$GSI_INC $$DB_INC -LIBS += -L$$DESTDIR -lklayout_tl -lklayout_gsi -lklayout_db +unit_tests.depends += rdb diff --git a/src/rdb/gsiDeclRdb.cc b/src/rdb/rdb/gsiDeclRdb.cc similarity index 100% rename from src/rdb/gsiDeclRdb.cc rename to src/rdb/rdb/gsiDeclRdb.cc diff --git a/src/rdb/rdb.cc b/src/rdb/rdb/rdb.cc similarity index 100% rename from src/rdb/rdb.cc rename to src/rdb/rdb/rdb.cc diff --git a/src/rdb/rdb.h b/src/rdb/rdb/rdb.h similarity index 100% rename from src/rdb/rdb.h rename to src/rdb/rdb/rdb.h diff --git a/src/rdb/rdb/rdb.pro b/src/rdb/rdb/rdb.pro new file mode 100644 index 000000000..c32232473 --- /dev/null +++ b/src/rdb/rdb/rdb.pro @@ -0,0 +1,34 @@ + +DESTDIR = $$OUT_PWD/../.. +TARGET = klayout_rdb + +include($$PWD/../../lib.pri) + +DEFINES += MAKE_RDB_LIBRARY + +FORMS = \ + +RESOURCES = \ + +SOURCES = \ + gsiDeclRdb.cc \ + rdb.cc \ + rdbForceLink.cc \ + rdbFile.cc \ + rdbReader.cc \ + rdbRVEReader.cc \ + rdbTiledRdbOutputReceiver.cc \ + rdbUtils.cc \ + +HEADERS = \ + rdb.h \ + rdbForceLink.h \ + rdbReader.h \ + rdbTiledRdbOutputReceiver.h \ + rdbUtils.h \ + rdbCommon.h + +INCLUDEPATH += $$TL_INC $$GSI_INC $$DB_INC +DEPENDPATH += $$TL_INC $$GSI_INC $$DB_INC +LIBS += -L$$DESTDIR -lklayout_tl -lklayout_gsi -lklayout_db + diff --git a/src/rdb/rdbCommon.h b/src/rdb/rdb/rdbCommon.h similarity index 100% rename from src/rdb/rdbCommon.h rename to src/rdb/rdb/rdbCommon.h diff --git a/src/rdb/rdbFile.cc b/src/rdb/rdb/rdbFile.cc similarity index 100% rename from src/rdb/rdbFile.cc rename to src/rdb/rdb/rdbFile.cc diff --git a/src/rdb/rdbForceLink.cc b/src/rdb/rdb/rdbForceLink.cc similarity index 100% rename from src/rdb/rdbForceLink.cc rename to src/rdb/rdb/rdbForceLink.cc diff --git a/src/rdb/rdbForceLink.h b/src/rdb/rdb/rdbForceLink.h similarity index 100% rename from src/rdb/rdbForceLink.h rename to src/rdb/rdb/rdbForceLink.h diff --git a/src/rdb/rdbRVEReader.cc b/src/rdb/rdb/rdbRVEReader.cc similarity index 100% rename from src/rdb/rdbRVEReader.cc rename to src/rdb/rdb/rdbRVEReader.cc diff --git a/src/rdb/rdbReader.cc b/src/rdb/rdb/rdbReader.cc similarity index 100% rename from src/rdb/rdbReader.cc rename to src/rdb/rdb/rdbReader.cc diff --git a/src/rdb/rdbReader.h b/src/rdb/rdb/rdbReader.h similarity index 100% rename from src/rdb/rdbReader.h rename to src/rdb/rdb/rdbReader.h diff --git a/src/rdb/rdbTiledRdbOutputReceiver.cc b/src/rdb/rdb/rdbTiledRdbOutputReceiver.cc similarity index 100% rename from src/rdb/rdbTiledRdbOutputReceiver.cc rename to src/rdb/rdb/rdbTiledRdbOutputReceiver.cc diff --git a/src/rdb/rdbTiledRdbOutputReceiver.h b/src/rdb/rdb/rdbTiledRdbOutputReceiver.h similarity index 100% rename from src/rdb/rdbTiledRdbOutputReceiver.h rename to src/rdb/rdb/rdbTiledRdbOutputReceiver.h diff --git a/src/rdb/rdbUtils.cc b/src/rdb/rdb/rdbUtils.cc similarity index 100% rename from src/rdb/rdbUtils.cc rename to src/rdb/rdb/rdbUtils.cc diff --git a/src/rdb/rdbUtils.h b/src/rdb/rdb/rdbUtils.h similarity index 100% rename from src/rdb/rdbUtils.h rename to src/rdb/rdb/rdbUtils.h diff --git a/src/unit_tests/rdb.cc b/src/rdb/unit_tests/rdb.cc similarity index 100% rename from src/unit_tests/rdb.cc rename to src/rdb/unit_tests/rdb.cc diff --git a/src/rdb/unit_tests/unit_tests.pro b/src/rdb/unit_tests/unit_tests.pro new file mode 100644 index 000000000..13b3afdb5 --- /dev/null +++ b/src/rdb/unit_tests/unit_tests.pro @@ -0,0 +1,16 @@ + +DESTDIR_UT = $$OUT_PWD/../.. +DESTDIR = $$OUT_PWD/.. + +TARGET = rdb_tests + +include($$PWD/../../lib_ut.pri) + +SOURCES = \ + rdb.cc \ + +INCLUDEPATH += $$RDB_INC $$TL_INC $$DB_INC $$GSI_INC $$UT_INC +DEPENDPATH += $$RDB_INC $$TL_INC $$DB_INC $$GSI_INC $$UT_INC + +LIBS += -L$$DESTDIR_UT -lklayout_rdb -lklayout_db -lklayout_tl -lklayout_gsi -lklayout_ut + diff --git a/src/unit_tests/unit_test_main.cc b/src/unit_tests/unit_test_main.cc index 52a1908b5..5f7ccac9a 100644 --- a/src/unit_tests/unit_test_main.cc +++ b/src/unit_tests/unit_test_main.cc @@ -1,4 +1,5 @@ + /* KLayout Layout Viewer @@ -23,13 +24,470 @@ #include "utHead.h" +#include "tlStaticObjects.h" +#include "tlTimer.h" +#include "tlSystemPaths.h" +#include "tlCommandLineParser.h" +#include "layApplication.h" +#include "rba.h" +#include "pya.h" +#include "gsiDecl.h" +#include "gsiExternalMain.h" + +#include +#include +#include + +#if !defined(_WIN32) +# include +#endif +#if defined(_WIN32) +# include +#endif + // required to force linking of the "ext" and "lib" module #include "extForceLink.h" #include "libForceLink.h" +static int main_cont (int argc, char **argv); + int -main (int argc, char **argv) +main (int argc, char **argv) { - return ut::main (argc, argv); + int ret = rba::RubyInterpreter::initialize (argc, argv, &main_cont); + + // NOTE: this needs to happen after the Ruby interpreter went down since otherwise the GC will + // access objects that are already cleaned up. + tl::StaticObjects::cleanup (); + + return ret; } +static int +run_tests (const std::vector &selected_tests, bool editable, bool non_editable, bool slow, lay::Application &app, bool gsi_coverage, const std::vector &class_names_vector) +{ + std::set class_names; + class_names.insert (class_names_vector.begin (), class_names_vector.end ()); + + tl::Timer grand_timer; + grand_timer.start (); + + int failed_ne = 0, failed_e = 0; + std::vector failed_tests_e, failed_tests_ne; + int skipped_ne = 0, skipped_e = 0; + std::vector skipped_tests_e, skipped_tests_ne; + + for (int e = 0; e < 2; ++e) { + + if ((non_editable && e == 0) || (editable && e == 1)) { + + std::string mode (e == 0 ? "non-editable" : "editable"); + ut::ctrl << ""; + + ut::noctrl << tl::replicate ("=", ut::TestConsole::instance ()->real_columns ()); + ut::noctrl << "Running tests in " << mode << " mode ..."; + app.set_editable (e != 0); + + int failed = 0; + std::vector failed_tests; + int skipped = 0; + std::vector skipped_tests; + + tl::Timer timer; + + timer.start (); + + try { + + failed = 0; + failed_tests.clear (); + skipped = 0; + skipped_tests.clear (); + + for (std::vector ::const_iterator t = selected_tests.begin (); t != selected_tests.end (); ++t) { + (*t)->remove_tmp_folder (); + } + + for (std::vector ::const_iterator t = selected_tests.begin (); t != selected_tests.end (); ++t) { + + ut::ctrl << "name () << "\">"; + + ut::noctrl << tl::replicate ("-", ut::TestConsole::instance ()->real_columns ()); + ut::noctrl << "Running " << (*t)->name (); + + try { + + if (! (*t)->do_test (e != 0, slow)) { + + ut::ctrl << "name ()) << " failed (continued mode - see previous messages)" << "\"/>"; + tl::error << "Test " << (*t)->name () << " failed (continued mode - see previous messages)"; + + failed_tests.push_back (*t); + ++failed; + + } + + } catch (tl::CancelException &) { + + ut::ctrl << ""; + tl::error << "Test " << (*t)->name () << " skipped"; + + skipped_tests.push_back (*t); + ++skipped; + + } catch (tl::Exception &ex) { + + ut::ctrl << ""; + tl::error << "Test " << (*t)->name () << " failed:"; + tl::info << ex.msg (); + + failed_tests.push_back (*t); + ++failed; + + } + + ut::ctrl << ""; + + } + + } catch (tl::Exception &ex) { + tl::error << "Caught tl::exception: " << ex.msg (); + failed = 1; + } catch (std::exception &ex) { + tl::error << "Caught std::exception: " << std::string (ex.what ()); + failed = 1; + } catch (...) { + tl::error << "Caught unspecific exception"; + failed = 1; + } + + timer.stop (); + + ut::ctrl << ""; + + ut::noctrl << tl::replicate ("=", ut::TestConsole::instance ()->real_columns ()); + ut::noctrl << "Summary"; + + if (skipped > 0) { + if (e == 0) { + skipped_tests_ne = skipped_tests; + skipped_ne = skipped; + } else { + skipped_tests_e = skipped_tests; + skipped_e = skipped; + } + tl::warn << skipped << " test(s) skipped"; + } + + if (failed > 0) { + if (e == 0) { + failed_tests_ne = failed_tests; + failed_ne = failed; + } else { + failed_tests_e = failed_tests; + failed_e = failed; + } + tl::warn << failed << " test(s) failed"; + } else { + tl::info << "All tests passed in " << mode << " mode."; + } + + ut::ctrl << ""; + + ut::noctrl << "Total time: " << timer.sec_wall () << "s (wall) " << timer.sec_user () << "s (user) " << timer.sec_sys () << "s (sys)"; + ut::ctrl << ""; + + ut::ctrl << ""; + + } + + } + + grand_timer.stop (); + + // GSI diagnostics: print all methods that have not been called + if (gsi_coverage) { + + ut::noctrl << tl::replicate ("=", ut::TestConsole::instance ()->real_columns ()); + ut::noctrl << "GSI coverage test"; + + ut::ctrl << ""; + + bool first = true; + for (gsi::ClassBase::class_iterator c = gsi::ClassBase::begin_classes (); c != gsi::ClassBase::end_classes (); ++c) { + + if (gsi_coverage && !class_names.empty () && class_names.find (c->name ()) == class_names.end ()) { + continue; + } + + bool first_of_class = true; + for (gsi::ClassBase::method_iterator m = c->begin_methods (); m != c->end_methods (); ++m) { + + if (!dynamic_cast (*m) && !(*m)->was_called ()) { + + if (first) { + first = false; + tl::warn << "GSI coverage test failed - the following methods were not called:"; + } + if (first_of_class) { + tl::warn << tl::replicate (" ", ut::TestConsole::instance ()->indent ()) << "Class " << c->name (); + first_of_class = false; + } + tl::warn << tl::replicate (" ", ut::TestConsole::instance ()->indent () * 2) << (*m)->to_string (); + + } + + } + + } + + if (first) { + tl::info << "GSI coverage test passed."; + } + + ut::ctrl << ""; + + } + + ut::noctrl << tl::replicate ("=", ut::TestConsole::instance ()->real_columns ()); + ut::noctrl << "Grand Summary"; + + ut::ctrl << ""; + + if (skipped_e + skipped_ne > 0) { + if (non_editable) { + tl::warn << "Skipped in non-editable mode"; + for (std::vector ::const_iterator f = skipped_tests_ne.begin (); f != skipped_tests_ne.end (); ++f) { + tl::warn << tl::replicate (" ", ut::TestConsole::instance ()->indent ()) << (*f)->name (); + } + } + if (editable) { + tl::warn << "Skipped in editable mode"; + for (std::vector ::const_iterator f = skipped_tests_e.begin (); f != skipped_tests_e.end (); ++f) { + tl::warn << tl::replicate (" ", ut::TestConsole::instance ()->indent ()) << (*f)->name (); + } + } + tl::warn << tl::to_string (skipped_e + skipped_ne) << " test(s) skipped"; + } + + int result = failed_e + failed_ne; + if (result > 0) { + if (non_editable) { + tl::warn << "Failed in non-editable mode"; + for (std::vector ::const_iterator f = failed_tests_ne.begin (); f != failed_tests_ne.end (); ++f) { + tl::warn << tl::replicate (" ", ut::TestConsole::instance ()->indent ()) << (*f)->name (); + } + } + if (editable) { + tl::warn << "Failed in editable mode"; + for (std::vector ::const_iterator f = failed_tests_e.begin (); f != failed_tests_e.end (); ++f) { + tl::warn << tl::replicate (" ", ut::TestConsole::instance ()->indent ()) << (*f)->name (); + } + } + tl::warn << tl::to_string (result) << " test(s) failed"; + } else { + tl::info << "All tests passed."; + } + + ut::ctrl << ""; + + ut::noctrl << "Grand total time: " << grand_timer.sec_wall () << "s (wall) " << grand_timer.sec_user () << "s (user) " << grand_timer.sec_sys () << "s (sys)"; + ut::ctrl << ""; + + return result; +} + +static int +main_cont (int argc, char **argv) +{ + int result = 0; + + try { + + pya::PythonInterpreter::initialize (); + gsi::initialize_external (); + + // Search and initialize plugin unit tests + + QStringList name_filters; + name_filters << QString::fromUtf8 ("*.ut"); + + QDir inst_dir (tl::to_qstring (tl::get_inst_path ())); + QStringList inst_modules = inst_dir.entryList (name_filters); + inst_modules.sort (); + + for (QStringList::const_iterator im = inst_modules.begin (); im != inst_modules.end (); ++im) { + + QFileInfo ut_file (inst_dir.path (), *im); + if (ut_file.exists () && ut_file.isReadable ()) { + + std::string pp = tl::to_string (ut_file.absoluteFilePath ()); + tl::log << "Loading unit tests " << pp; + + // NOTE: since we are using a different suffix ("*.ut"), we can't use QLibrary. +#ifdef _WIN32 + // there is no "dlopen" on mingw, so we need to emulate it. + HINSTANCE handle = LoadLibraryW ((const wchar_t *) tl::to_qstring (pp).constData ()); + if (! handle) { + throw tl::Exception (tl::sprintf ("Unable to load plugin tests: %s with error message: %s", pp.c_str (), GetLastError ())); + } +#else + void *handle; + handle = dlopen (tl::string_to_system (pp).c_str (), RTLD_LAZY); + if (! handle) { + throw tl::Exception (tl::sprintf ("Unable to load plugin tests: %s", pp.c_str ())); + } +#endif + + } + + } + + // No side effects + tl::set_klayout_path (std::vector ()); + + int ac = 2; + static char av0[] = "unit_test"; + static char av1[] = "-z"; // don't show main window + static char av2[] = "-nc"; // No configuration file + static char av3[] = "-rx"; // No mplicit macros + char *av[] = { av0, av1, av2, av3, 0 }; + lay::Application app (ac, av, false); + app.autorun (); + + #if QT_VERSION < 0x050000 + QTextCodec::setCodecForTr (QTextCodec::codecForName ("utf8")); + #endif + + bool editable = false, non_editable = false; + bool gsi_coverage = false; + std::vector class_names; + std::vector test_list; + std::vector exclude_test_list; + + bool xml_format = false; + bool list_tests = false; + bool slow = false; + bool verbose = false; + bool debug_mode = false; + bool continue_flag = false; + + tl::CommandLineOptions cmd; + cmd << tl::arg ("-a", &xml_format, "Provide XML output format (JUnit format)") + << tl::arg ("-l", &list_tests, "Lists tests and exits") + << tl::arg ("-e", &editable, "Uses editable mode") + << tl::arg ("-ne", &non_editable, "Uses non-editable mode") + << tl::arg ("-c", &continue_flag, "Continues after an error") + << tl::arg ("-i", &debug_mode, "Uses debug mode", + "In debug mode, execution stops after an error and if possible, fix instructions are " + "printed." + ) + << tl::arg ("-s", &slow, "Includes slow (long runner) tests") + << tl::arg ("-v", &verbose, "Provides verbose output") + << tl::arg ("-g", &gsi_coverage, "Produces a GSI test coverage statistics") + << tl::arg ("*-gg=class", &class_names, "Produces a specific GDS coverage statistics" + "With this specification, coverage will be printed for this specific class. " + "This option can be used multiple times to add more classes." + ) + << tl::arg ("-x=test", &exclude_test_list, "Exclude the following tests" + "This option can be given multiple times or with a comma-separated list " + "of pattern. Test tests matching one of the exclude pattern " + "are not executed." + ) + << tl::arg ("?*test", &test_list, "The pattern for the tests to execute") + ; + + cmd.brief ("The runner executable for execution of the unit tests"); + + cmd.parse (argc, argv); + + if (!editable && !non_editable) { + editable = non_editable = true; + } + + if (!class_names.empty ()) { + gsi_coverage = true; + } + + if (list_tests) { + tl::info << "List of installed tests:"; + for (std::vector::const_iterator i = ut::Registrar::instance()->tests ().begin (); i != ut::Registrar::instance()->tests ().end (); ++i) { + tl::info << " " << (*i)->name (); + } + throw tl::CancelException (); + } + + ut::set_verbose (verbose); + ut::set_continue_flag (continue_flag); + ut::set_debug_mode (debug_mode); + + ut::TestConsole console (stdout, xml_format); + + ut::noctrl << tl::replicate ("=", console.real_columns ()); + ut::noctrl << "Entering KLayout test suite"; + + tl::info << "TESTSRC=" << ut::testsrc (); + tl::info << "TESTTMP=" << tl::to_string (QDir (tl::to_qstring (ut::testtmp ())).absolutePath ()); + + const std::vector *selected_tests = 0; + std::vector subset; + if (! test_list.empty ()) { + + selected_tests = ⊂ + tl::info << "Selected tests:"; + + for (std::vector::const_iterator i = ut::Registrar::instance()->tests ().begin (); i != ut::Registrar::instance()->tests ().end (); ++i) { + + bool exclude = false; + + for (std::vector::const_iterator m = exclude_test_list.begin (); m != exclude_test_list.end () && !exclude; ++m) { + QRegExp re (tl::to_qstring (*m), Qt::CaseInsensitive, QRegExp::Wildcard); + if (re.indexIn (tl::to_qstring ((*i)->name ())) == 0) { + exclude = true; + } + } + + for (std::vector::const_iterator m = test_list.begin (); !exclude && m != test_list.end (); ++m) { + QRegExp re (tl::to_qstring (*m), Qt::CaseInsensitive, QRegExp::Wildcard); + if (re.indexIn (tl::to_qstring ((*i)->name ())) == 0) { + tl::info << " " << (*i)->name (); + subset.push_back (*i); + break; + } + } + + } + + } else { + selected_tests = &ut::Registrar::instance()->tests (); + } + + try { + + ut::ctrl << ""; + ut::ctrl << ""; + + result = run_tests (*selected_tests, editable, non_editable, slow, app, gsi_coverage, class_names); + + ut::ctrl << ""; + + } catch (...) { + ut::ctrl << ""; + throw; + } + + } catch (tl::CancelException &) { + result = 0; + } catch (tl::Exception &ex) { + tl::error << ex.msg (); + result = -1; + } catch (std::exception &ex) { + tl::error << ex.what (); + result = -1; + } catch (...) { + tl::error << "Unspecific exception"; + result = -1; + } + + return result; +} diff --git a/src/unit_tests/unit_tests.pro b/src/unit_tests/unit_tests.pro index 989cb838e..1dae7eae6 100644 --- a/src/unit_tests/unit_tests.pro +++ b/src/unit_tests/unit_tests.pro @@ -1,5 +1,5 @@ -DESTDIR=$$OUT_PWD/.. +DESTDIR = $$OUT_PWD/.. include($$PWD/../klayout.pri) include($$PWD/../with_all_libs.pri) @@ -9,24 +9,8 @@ TEMPLATE = app TARGET = ut_runner SOURCES = \ - imgObject.cc \ - layAnnotationShapes.cc \ - layBitmap.cc \ - layBitmapsToImage.cc \ - layLayerProperties.cc \ - layParsedLayerSource.cc \ - layRenderer.cc \ - laySalt.cc \ - laySnap.cc \ - rdb.cc \ - -# main components: -SOURCES += \ unit_test_main.cc \ -equals(HAVE_QT5, "1") { - QT += testlib -} else { - CONFIG += qtestlib +!win32 { + LIBS += -ldl } - diff --git a/src/ut/ut.pro b/src/ut/ut.pro index 532b7a60a..078b42b96 100644 --- a/src/ut/ut.pro +++ b/src/ut/ut.pro @@ -2,12 +2,10 @@ DESTDIR = $$OUT_PWD/.. TARGET = klayout_ut -include($$PWD/../klayout.pri) +include($$PWD/../lib.pri) DEFINES += MAKE_UT_LIBRARY -TEMPLATE = lib - # Input HEADERS = \ utHead.h \ @@ -16,14 +14,13 @@ HEADERS = \ utCommon.h SOURCES = \ - utMain.cc \ utTestConsole.cc \ utTestBase.cc \ -INCLUDEPATH = $$TL_INC $$DB_INC $$GSI_INC $$LAY_INC $$EXT_INC $$LIB_INC -DEPENDPATH = $$TL_INC $$DB_INC $$GSI_INC $$LAY_INC $$EXT_INC $$LIB_INC +INCLUDEPATH = $$TL_INC $$DB_INC $$GSI_INC +DEPENDPATH = $$TL_INC $$DB_INC $$GSI_INC -LIBS += -L$$DESTDIR -lklayout_tl -lklayout_db -lklayout_gsi -lklayout_lay -lklayout_ext -lklayout_lib +LIBS += -L$$DESTDIR -lklayout_tl -lklayout_db -lklayout_gsi INCLUDEPATH += $$RBA_INC DEPENDPATH += $$RBA_INC diff --git a/src/ut/utHead.h b/src/ut/utHead.h index 5177bc3e4..692425b68 100644 --- a/src/ut/utHead.h +++ b/src/ut/utHead.h @@ -30,13 +30,8 @@ namespace ut { -extern tl::LogTee ctrl; -extern tl::LogTee noctrl; - -/** - * @brief The unit test execution function - */ -UT_PUBLIC int main (int argc, char **argv); +extern UT_PUBLIC tl::LogTee ctrl; +extern UT_PUBLIC tl::LogTee noctrl; } // namespace ut diff --git a/src/ut/utMain.cc b/src/ut/utMain.cc deleted file mode 100644 index 55f3042c2..000000000 --- a/src/ut/utMain.cc +++ /dev/null @@ -1,492 +0,0 @@ - -/* - - KLayout Layout Viewer - Copyright (C) 2006-2017 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 "utHead.h" -#include "tlStaticObjects.h" -#include "tlTimer.h" -#include "tlSystemPaths.h" -#include "tlCommandLineParser.h" -#include "layApplication.h" -#include "rba.h" -#include "pya.h" -#include "gsiDecl.h" -#include "gsiExternalMain.h" - -#include -#include -#include - -#if !defined(_WIN32) -# include -#endif -#if defined(_WIN32) -# include -#endif - -namespace ut -{ - -static int main_cont (int argc, char **argv); - -int -main (int argc, char **argv) -{ - int ret = rba::RubyInterpreter::initialize (argc, argv, &main_cont); - - // NOTE: this needs to happen after the Ruby interpreter went down since otherwise the GC will - // access objects that are already cleaned up. - tl::StaticObjects::cleanup (); - - return ret; -} - -int -run_tests (const std::vector &selected_tests, bool editable, bool non_editable, bool slow, lay::Application &app, bool gsi_coverage, const std::vector &class_names_vector) -{ - std::set class_names; - class_names.insert (class_names_vector.begin (), class_names_vector.end ()); - - tl::Timer grand_timer; - grand_timer.start (); - - int failed_ne = 0, failed_e = 0; - std::vector failed_tests_e, failed_tests_ne; - int skipped_ne = 0, skipped_e = 0; - std::vector skipped_tests_e, skipped_tests_ne; - - for (int e = 0; e < 2; ++e) { - - if ((non_editable && e == 0) || (editable && e == 1)) { - - std::string mode (e == 0 ? "non-editable" : "editable"); - ut::ctrl << ""; - - ut::noctrl << tl::replicate ("=", TestConsole::instance ()->real_columns ()); - ut::noctrl << "Running tests in " << mode << " mode ..."; - app.set_editable (e != 0); - - int failed = 0; - std::vector failed_tests; - int skipped = 0; - std::vector skipped_tests; - - tl::Timer timer; - - timer.start (); - - try { - - failed = 0; - failed_tests.clear (); - skipped = 0; - skipped_tests.clear (); - - for (std::vector ::const_iterator t = selected_tests.begin (); t != selected_tests.end (); ++t) { - (*t)->remove_tmp_folder (); - } - - for (std::vector ::const_iterator t = selected_tests.begin (); t != selected_tests.end (); ++t) { - - ut::ctrl << "name () << "\">"; - - ut::noctrl << tl::replicate ("-", TestConsole::instance ()->real_columns ()); - ut::noctrl << "Running " << (*t)->name (); - - try { - - if (! (*t)->do_test (e != 0, slow)) { - - ut::ctrl << "name ()) << " failed (continued mode - see previous messages)" << "\"/>"; - tl::error << "Test " << (*t)->name () << " failed (continued mode - see previous messages)"; - - failed_tests.push_back (*t); - ++failed; - - } - - } catch (tl::CancelException &) { - - ut::ctrl << ""; - tl::error << "Test " << (*t)->name () << " skipped"; - - skipped_tests.push_back (*t); - ++skipped; - - } catch (tl::Exception &ex) { - - ut::ctrl << ""; - tl::error << "Test " << (*t)->name () << " failed:"; - tl::info << ex.msg (); - - failed_tests.push_back (*t); - ++failed; - - } - - ut::ctrl << ""; - - } - - } catch (tl::Exception &ex) { - tl::error << "Caught tl::exception: " << ex.msg (); - failed = 1; - } catch (std::exception &ex) { - tl::error << "Caught std::exception: " << std::string (ex.what ()); - failed = 1; - } catch (...) { - tl::error << "Caught unspecific exception"; - failed = 1; - } - - timer.stop (); - - ut::ctrl << ""; - - ut::noctrl << tl::replicate ("=", TestConsole::instance ()->real_columns ()); - ut::noctrl << "Summary"; - - if (skipped > 0) { - if (e == 0) { - skipped_tests_ne = skipped_tests; - skipped_ne = skipped; - } else { - skipped_tests_e = skipped_tests; - skipped_e = skipped; - } - tl::warn << skipped << " test(s) skipped"; - } - - if (failed > 0) { - if (e == 0) { - failed_tests_ne = failed_tests; - failed_ne = failed; - } else { - failed_tests_e = failed_tests; - failed_e = failed; - } - tl::warn << failed << " test(s) failed"; - } else { - tl::info << "All tests passed in " << mode << " mode."; - } - - ut::ctrl << ""; - - ut::noctrl << "Total time: " << timer.sec_wall () << "s (wall) " << timer.sec_user () << "s (user) " << timer.sec_sys () << "s (sys)"; - ut::ctrl << ""; - - ut::ctrl << ""; - - } - - } - - grand_timer.stop (); - - // GSI diagnostics: print all methods that have not been called - if (gsi_coverage) { - - ut::noctrl << tl::replicate ("=", TestConsole::instance ()->real_columns ()); - ut::noctrl << "GSI coverage test"; - - ut::ctrl << ""; - - bool first = true; - for (gsi::ClassBase::class_iterator c = gsi::ClassBase::begin_classes (); c != gsi::ClassBase::end_classes (); ++c) { - - if (gsi_coverage && !class_names.empty () && class_names.find (c->name ()) == class_names.end ()) { - continue; - } - - bool first_of_class = true; - for (gsi::ClassBase::method_iterator m = c->begin_methods (); m != c->end_methods (); ++m) { - - if (!dynamic_cast (*m) && !(*m)->was_called ()) { - - if (first) { - first = false; - tl::warn << "GSI coverage test failed - the following methods were not called:"; - } - if (first_of_class) { - tl::warn << tl::replicate (" ", TestConsole::instance ()->indent ()) << "Class " << c->name (); - first_of_class = false; - } - tl::warn << tl::replicate (" ", TestConsole::instance ()->indent () * 2) << (*m)->to_string (); - - } - - } - - } - - if (first) { - tl::info << "GSI coverage test passed."; - } - - ut::ctrl << ""; - - } - - ut::noctrl << tl::replicate ("=", TestConsole::instance ()->real_columns ()); - ut::noctrl << "Grand Summary"; - - ut::ctrl << ""; - - if (skipped_e + skipped_ne > 0) { - if (non_editable) { - tl::warn << "Skipped in non-editable mode"; - for (std::vector ::const_iterator f = skipped_tests_ne.begin (); f != skipped_tests_ne.end (); ++f) { - tl::warn << tl::replicate (" ", TestConsole::instance ()->indent ()) << (*f)->name (); - } - } - if (editable) { - tl::warn << "Skipped in editable mode"; - for (std::vector ::const_iterator f = skipped_tests_e.begin (); f != skipped_tests_e.end (); ++f) { - tl::warn << tl::replicate (" ", TestConsole::instance ()->indent ()) << (*f)->name (); - } - } - tl::warn << tl::to_string (skipped_e + skipped_ne) << " test(s) skipped"; - } - - int result = failed_e + failed_ne; - if (result > 0) { - if (non_editable) { - tl::warn << "Failed in non-editable mode"; - for (std::vector ::const_iterator f = failed_tests_ne.begin (); f != failed_tests_ne.end (); ++f) { - tl::warn << tl::replicate (" ", TestConsole::instance ()->indent ()) << (*f)->name (); - } - } - if (editable) { - tl::warn << "Failed in editable mode"; - for (std::vector ::const_iterator f = failed_tests_e.begin (); f != failed_tests_e.end (); ++f) { - tl::warn << tl::replicate (" ", TestConsole::instance ()->indent ()) << (*f)->name (); - } - } - tl::warn << tl::to_string (result) << " test(s) failed"; - } else { - tl::info << "All tests passed."; - } - - ut::ctrl << ""; - - ut::noctrl << "Grand total time: " << grand_timer.sec_wall () << "s (wall) " << grand_timer.sec_user () << "s (user) " << grand_timer.sec_sys () << "s (sys)"; - ut::ctrl << ""; - - return result; -} - -int -main_cont (int argc, char **argv) -{ - int result = 0; - - try { - - pya::PythonInterpreter::initialize (); - gsi::initialize_external (); - - // Search and initialize plugin unit tests - - QStringList name_filters; - name_filters << QString::fromUtf8 ("*.ut"); - - QDir inst_dir (tl::to_qstring (tl::get_inst_path ())); - QStringList inst_modules = inst_dir.entryList (name_filters); - inst_modules.sort (); - - for (QStringList::const_iterator im = inst_modules.begin (); im != inst_modules.end (); ++im) { - - QFileInfo ut_file (inst_dir.path (), *im); - if (ut_file.exists () && ut_file.isReadable ()) { - - std::string pp = tl::to_string (ut_file.absoluteFilePath ()); - tl::log << "Loading unit tests " << pp; - - // NOTE: since we are using a different suffix ("*.ut"), we can't use QLibrary. -#ifdef _WIN32 - // there is no "dlopen" on mingw, so we need to emulate it. - HINSTANCE handle = LoadLibraryW ((const wchar_t *) tl::to_qstring (pp).constData ()); - if (! handle) { - throw tl::Exception (tl::sprintf ("Unable to load plugin tests: %s with error message: %s", pp.c_str (), GetLastError ())); - } -#else - void *handle; - handle = dlopen (tl::string_to_system (pp).c_str (), RTLD_LAZY); - if (! handle) { - throw tl::Exception (tl::sprintf ("Unable to load plugin tests: %s", pp.c_str ())); - } -#endif - - } - - } - - // No side effects - tl::set_klayout_path (std::vector ()); - - int ac = 2; - static char av0[] = "unit_test"; - static char av1[] = "-z"; // don't show main window - static char av2[] = "-nc"; // No configuration file - static char av3[] = "-rx"; // No mplicit macros - char *av[] = { av0, av1, av2, av3, 0 }; - lay::Application app (ac, av, false); - app.autorun (); - - #if QT_VERSION < 0x050000 - QTextCodec::setCodecForTr (QTextCodec::codecForName ("utf8")); - #endif - - bool editable = false, non_editable = false; - bool gsi_coverage = false; - std::vector class_names; - std::vector test_list; - std::vector exclude_test_list; - - bool xml_format = false; - bool list_tests = false; - bool slow = false; - bool verbose = false; - bool debug_mode = false; - bool continue_flag = false; - - tl::CommandLineOptions cmd; - cmd << tl::arg ("-a", &xml_format, "Provide XML output format (JUnit format)") - << tl::arg ("-l", &list_tests, "Lists tests and exits") - << tl::arg ("-e", &editable, "Uses editable mode") - << tl::arg ("-ne", &non_editable, "Uses non-editable mode") - << tl::arg ("-c", &continue_flag, "Continues after an error") - << tl::arg ("-i", &debug_mode, "Uses debug mode", - "In debug mode, execution stops after an error and if possible, fix instructions are " - "printed." - ) - << tl::arg ("-s", &slow, "Includes slow (long runner) tests") - << tl::arg ("-v", &verbose, "Provides verbose output") - << tl::arg ("-g", &gsi_coverage, "Produces a GSI test coverage statistics") - << tl::arg ("*-gg=class", &class_names, "Produces a specific GDS coverage statistics" - "With this specification, coverage will be printed for this specific class. " - "This option can be present multiple times." - ) - << tl::arg ("-x=test", &exclude_test_list, "Exclude the following tests" - "This option can be given multiple times or with a comma-separated list " - "of pattern. Test tests matching one of the exclude pattern " - "are not executed." - ) - << tl::arg ("?*test", &test_list, "The pattern for the tests to execute") - ; - - cmd.brief ("The runner executable for execution of the unit tests"); - - cmd.parse (argc, argv); - - if (!editable && !non_editable) { - editable = non_editable = true; - } - - if (!class_names.empty ()) { - gsi_coverage = true; - } - - if (list_tests) { - tl::info << "List of installed tests:"; - for (std::vector::const_iterator i = ut::Registrar::instance()->tests ().begin (); i != ut::Registrar::instance()->tests ().end (); ++i) { - tl::info << " " << (*i)->name (); - } - throw tl::CancelException (); - } - - ut::set_verbose (verbose); - ut::set_continue_flag (continue_flag); - ut::set_debug_mode (debug_mode); - - ut::TestConsole console (stdout, xml_format); - - ut::noctrl << tl::replicate ("=", console.real_columns ()); - ut::noctrl << "Entering KLayout test suite"; - - tl::info << "TESTSRC=" << ut::testsrc (); - tl::info << "TESTTMP=" << tl::to_string (QDir (tl::to_qstring (ut::testtmp ())).absolutePath ()); - - const std::vector *selected_tests = 0; - std::vector subset; - if (! test_list.empty ()) { - - selected_tests = ⊂ - tl::info << "Selected tests:"; - - for (std::vector::const_iterator i = ut::Registrar::instance()->tests ().begin (); i != ut::Registrar::instance()->tests ().end (); ++i) { - - bool exclude = false; - - for (std::vector::const_iterator m = exclude_test_list.begin (); m != exclude_test_list.end () && !exclude; ++m) { - QRegExp re (tl::to_qstring (*m), Qt::CaseInsensitive, QRegExp::Wildcard); - if (re.indexIn (tl::to_qstring ((*i)->name ())) == 0) { - exclude = true; - } - } - - for (std::vector::const_iterator m = test_list.begin (); !exclude && m != test_list.end (); ++m) { - QRegExp re (tl::to_qstring (*m), Qt::CaseInsensitive, QRegExp::Wildcard); - if (re.indexIn (tl::to_qstring ((*i)->name ())) == 0) { - tl::info << " " << (*i)->name (); - subset.push_back (*i); - break; - } - } - - } - - } else { - selected_tests = &ut::Registrar::instance()->tests (); - } - - try { - - ut::ctrl << ""; - ut::ctrl << ""; - - result = run_tests (*selected_tests, editable, non_editable, slow, app, gsi_coverage, class_names); - - ut::ctrl << ""; - - } catch (...) { - ut::ctrl << ""; - throw; - } - - } catch (tl::CancelException &) { - result = 0; - } catch (tl::Exception &ex) { - tl::error << ex.msg (); - result = -1; - } catch (std::exception &ex) { - tl::error << ex.what (); - result = -1; - } catch (...) { - tl::error << "Unspecific exception"; - result = -1; - } - - return result; -} - -} // namespace ut - diff --git a/src/ut/utTestBase.h b/src/ut/utTestBase.h index 2ef7433ea..eb84b9a88 100644 --- a/src/ut/utTestBase.h +++ b/src/ut/utTestBase.h @@ -481,7 +481,7 @@ private: /** * @brief The registration facility for tests */ -struct Registrar +struct UT_PUBLIC Registrar { static void reg (ut::TestBase *t) { diff --git a/src/ut/utTestConsole.h b/src/ut/utTestConsole.h index a3d700ece..e638746f7 100644 --- a/src/ut/utTestConsole.h +++ b/src/ut/utTestConsole.h @@ -68,7 +68,7 @@ private: /** * @brief Redirects the interpreter output and serves as a general output device */ -class TestConsole +class UT_PUBLIC TestConsole : public gsi::Console { public: