Finished refactoring of unit tests. Now they are modularized.

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
 

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
+

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
+

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
 

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 \

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